Changeset 33714 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Display

Timestamp:

Nov 2, 2010 11:36:10 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: CrHgsmi cleanup, free resources correctly; 2D fixes

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm

Files:

• VBoxCrHgsmi.cpp (modified) (4 diffs)
• VBoxDispD3D.cpp (modified) (3 diffs)
• VBoxUhgsmiBase.h (modified) (1 diff)
• VBoxUhgsmiKmt.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxCrHgsmi.cpp

@@ -4 +4 @@
 #include "VBoxUhgsmiKmt.h"
 
+static VBOXDISPKMT_CALLBACKS g_VBoxCrHgsmiKmtCallbacks;
+static int g_bVBoxKmtCallbacksInited = 0;
+
+#ifdef VBOX_CRHGSMI_WITH_D3DDEV
 static VBOXCRHGSMI_CALLBACKS g_VBoxCrHgsmiCallbacks;
 static HMODULE g_hVBoxCrHgsmiProvider = NULL;
 static uint32_t g_cVBoxCrHgsmiProvider = 0;
 
-static VBOXDISPKMT_CALLBACKS g_VBoxCrHgsmiKmtCallbacks;
 
 typedef VBOXWDDMDISP_DECL(int) FNVBOXDISPCRHGSMI_INIT(PVBOXCRHGSMI_CALLBACKS pCallbacks);
@@ -25 +28 @@
 VBOXCRHGSMI_DECL(int) VBoxCrHgsmiInit(PVBOXCRHGSMI_CALLBACKS pCallbacks)
 {
-    static int bKmtCallbacksInited = 0;
-    if (!bKmtCallbacksInited)
+    if (!g_bVBoxKmtCallbacksInited)
     {
         HRESULT hr = vboxDispKmtCallbacksInit(&g_VBoxCrHgsmiKmtCallbacks);
         Assert(hr == S_OK);
         if (hr == S_OK)
-            bKmtCallbacksInited = 1;
+            g_bVBoxKmtCallbacksInited = 1;
         else
-            bKmtCallbacksInited = -1;
-    }
-
-    Assert(bKmtCallbacksInited);
-    if (bKmtCallbacksInited < 0)
+            g_bVBoxKmtCallbacksInited = -1;
+    }
+
+    Assert(g_bVBoxKmtCallbacksInited);
+    if (g_bVBoxKmtCallbacksInited < 0)
     {
         Assert(0);
@@ -135 +137 @@
     return NULL;
 }
+#else
+VBOXCRHGSMI_DECL(int) VBoxCrHgsmiInit()
+{
+    if (!g_bVBoxKmtCallbacksInited)
+    {
+        HRESULT hr = vboxDispKmtCallbacksInit(&g_VBoxCrHgsmiKmtCallbacks);
+        Assert(hr == S_OK);
+        if (hr == S_OK)
+            g_bVBoxKmtCallbacksInited = 1;
+        else
+            g_bVBoxKmtCallbacksInited = -1;
+    }
+
+    Assert(g_bVBoxKmtCallbacksInited);
+    if (g_bVBoxKmtCallbacksInited < 0)
+    {
+        Assert(0);
+        return VERR_NOT_SUPPORTED;
+    }
+
+    return VINF_SUCCESS;
+}
+
+VBOXCRHGSMI_DECL(PVBOXUHGSMI) VBoxCrHgsmiCreate()
+{
+    PVBOXUHGSMI_PRIVATE_KMT pHgsmiGL = (PVBOXUHGSMI_PRIVATE_KMT)RTMemAllocZ(sizeof (*pHgsmiGL));
+    if (pHgsmiGL)
+    {
+#if 0
+        HRESULT hr = vboxUhgsmiKmtCreate(pHgsmiGL, TRUE /* bD3D tmp for injection thread*/);
+#else
+        HRESULT hr = vboxUhgsmiKmtEscCreate(pHgsmiGL, TRUE /* bD3D tmp for injection thread*/);
+#endif
+        Assert(hr == S_OK);
+        if (hr == S_OK)
+        {
+            return &pHgsmiGL->BasePrivate.Base;
+        }
+        RTMemFree(pHgsmiGL);
+    }
+
+    return NULL;
+}
+
+VBOXCRHGSMI_DECL(void) VBoxCrHgsmiDestroy(PVBOXUHGSMI pHgsmi)
+{
+    PVBOXUHGSMI_PRIVATE_KMT pHgsmiGL = VBOXUHGSMIKMT_GET(pHgsmi);
+    HRESULT hr = vboxUhgsmiKmtDestroy(pHgsmiGL);
+    Assert(hr == S_OK);
+    if (hr == S_OK)
+    {
+        RTMemFree(pHgsmiGL);
+    }
+}
+#endif
 
 VBOXCRHGSMI_DECL(int) VBoxCrHgsmiTerm()
 {
-    Assert(0);
 #if 0
     PVBOXUHGSMI_PRIVATE_KMT pHgsmiGL = gt_pHgsmiGL;
@@ -151 +207 @@
         g_pfnVBoxDispCrHgsmiTerm();
 #endif
+    if (g_bVBoxKmtCallbacksInited > 0)
+    {
+        vboxDispKmtCallbacksTerm(&g_VBoxCrHgsmiKmtCallbacks);
+    }
     return VINF_SUCCESS;
 }

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.cpp

@@ -740 +740 @@
 #ifdef VBOX_WITH_CRHGSMI
 static __declspec(thread) PVBOXUHGSMI_PRIVATE_BASE gt_pHgsmi = NULL;
-#endif
 
 VBOXWDDMDISP_DECL(int) VBoxDispCrHgsmiInit(PVBOXCRHGSMI_CALLBACKS pCallbacks)
@@ -786 +785 @@
 }
 
-#ifdef VBOX_WITH_CRHGSMI
 static HRESULT vboxUhgsmiGlobalRetain()
 {
@@ -876 +874 @@
 #define VBOXDISPCRHGSMI_SCOPE_SET_DEV(_pDev) do {} while(0)
 #define VBOXDISPCRHGSMI_SCOPE_SET_GLOBAL() do {} while(0)
+
+VBOXWDDMDISP_DECL(int) VBoxDispCrHgsmiInit(void*)
+{
+    return VERR_NOT_IMPLEMENTED;
+}
+
+VBOXWDDMDISP_DECL(int) VBoxDispCrHgsmiTerm()
+{
+    return VERR_NOT_IMPLEMENTED;
+}
+
+VBOXWDDMDISP_DECL(void*) VBoxDispCrHgsmiQueryClient()
+{
+    return NULL;
+}
 #endif
 

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxUhgsmiBase.h

@@ -32 +32 @@
 {
     VBOXUHGSMI Base;
+#ifdef VBOX_CRHGSMI_WITH_D3DDEV
     HVBOXCRHGSMI_CLIENT hClient;
+#endif
 } VBOXUHGSMI_PRIVATE_BASE, *PVBOXUHGSMI_PRIVATE_BASE;
 

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxUhgsmiKmt.cpp

@@ -437 +437 @@
     pHgsmi->BasePrivate.Base.pfnBufferCreate = vboxUhgsmiKmtBufferCreate;
     pHgsmi->BasePrivate.Base.pfnBufferSubmitAsynch = vboxUhgsmiKmtBufferSubmitAsynch;
+#ifdef VBOX_CRHGSMI_WITH_D3DDEV
     pHgsmi->BasePrivate.hClient = NULL;
+#endif
     return vboxUhgsmiKmtEngineCreate(pHgsmi, bD3D);
 }
@@ -445 +447 @@
     pHgsmi->BasePrivate.Base.pfnBufferCreate = vboxUhgsmiKmtEscBufferCreate;
     pHgsmi->BasePrivate.Base.pfnBufferSubmitAsynch = vboxUhgsmiKmtEscBufferSubmitAsynch;
+#ifdef VBOX_CRHGSMI_WITH_D3DDEV
     pHgsmi->BasePrivate.hClient = NULL;
+#endif
     return vboxUhgsmiKmtEngineCreate(pHgsmi, bD3D);
 }