Changeset 29432 in vbox

Timestamp:

May 12, 2010 5:14:03 PM (15 years ago)

Author:

vboxsync

Message:

wddm/d3d: load/init wine d3d9 lib

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Display/Makefile.kmk (modified) (2 diffs)
• Display/wddm/VBoxDispD3D.cpp (modified) (7 diffs)
• Display/wddm/VBoxDispD3D.h (modified) (3 diffs)
• Display/wddm/VBoxDispD3DCmn.h (added)
• Display/wddm/VBoxDispD3DIf.cpp (added)
• Display/wddm/VBoxDispD3DIf.h (added)
• Miniport/wddm/VBoxVideoVbva.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk

@@ -79 +79 @@
 VBoxDispD3D_SOURCES  = \
         wddm/VBoxDispD3D.cpp \
+    wddm/VBoxDispD3DIf.cpp \
         wddm/VBoxDispD3D.def \
         wddm/VBoxDispD3D.rc
@@ -85 +86 @@
         $(VBOX_LIB_VBGL_R3)
 VBoxDispD3D_SDKS     = WINDDKWLH
+# VBoxDispD3D_INCS    += ../Wine/include
 
  ifeq ($(KBUILD_TARGET_ARCH), amd64)

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

@@ -29 +29 @@
 
 #include "VBoxDispD3D.h"
+#include "VBoxDispD3DCmn.h"
 
 #ifdef VBOXWDDMDISP_DEBUG
@@ -45 +46 @@
         case DLL_PROCESS_ATTACH:
         {
-            /* there __try __except are just to ensure the library does not assertion fail in case VBoxGuest is not present
-             * and VbglR3Init / VbglR3Term assertion fail */
-            __try
-            {
-//                LogRel(("VBoxDispD3D: DLL loaded.\n"));
-                RTR3Init();
+            RTR3Init();
+
+            vboxVDbgPrint(("VBoxDispD3D: DLL loaded.\n"));
+
 //                VbglR3Init();
-            }
-            __except (EXCEPTION_CONTINUE_EXECUTION)
-            {
-            }
-
             break;
         }
@@ -62 +56 @@
         case DLL_PROCESS_DETACH:
         {
-            /* there __try __except are just to ensure the library does not assertion fail in case VBoxGuest is not present
-             * and VbglR3Init / VbglR3Term assertion fail */
-//            __try
-//            {
-//                LogRel(("VBoxDispD3D: DLL unloaded.\n"));
+            vboxVDbgPrint(("VBoxDispD3D: DLL unloaded.\n"));
 //                VbglR3Term();
-//            }
-//            __except (EXCEPTION_CONTINUE_EXECUTION)
-//            {
-//            }
             /// @todo RTR3Term();
             break;
@@ -901 +887 @@
     vboxVDbgPrint(("==> "__FUNCTION__", hAdapter(0x%p)\n", hAdapter));
 
-//    AssertBreakpoint();
+    AssertBreakpoint();
 
     PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)RTMemAllocZ(sizeof (VBOXWDDMDISP_DEVICE));
@@ -1038 +1024 @@
     vboxVDbgPrint(("<== "__FUNCTION__", hAdapter(0x%p)\n", hAdapter));
 
-    return E_FAIL;
+    return S_OK;
 }
 
@@ -1045 +1031 @@
     vboxVDbgPrint(("==> "__FUNCTION__", hAdapter(0x%p)\n", hAdapter));
 
-//    AssertBreakpoint();
-
-    RTMemFree(hAdapter);
+    AssertBreakpoint();
+
+    PVBOXWDDMDISP_ADAPTER pAdapter = (PVBOXWDDMDISP_ADAPTER)hAdapter;
+    if (pAdapter->pD3D9If)
+    {
+        HRESULT hr = pAdapter->pD3D9If->Release();
+        Assert(hr == S_OK);
+        VBoxDispD3DClose(&pAdapter->D3D);
+    }
+
+    RTMemFree(pAdapter);
 
     vboxVDbgPrint(("<== "__FUNCTION__", hAdapter(0x%p)\n", hAdapter));
@@ -1058 +1052 @@
     vboxVDbgPrint(("==> "__FUNCTION__"\n"));
 
-//    AssertBreakpoint();
-
+    AssertBreakpoint();
+
+    HRESULT hr = S_OK;
     PVBOXWDDMDISP_ADAPTER pAdapter = (PVBOXWDDMDISP_ADAPTER)RTMemAllocZ(sizeof (VBOXWDDMDISP_ADAPTER));
     Assert(pAdapter);
-    if (!pAdapter)
+    if (pAdapter)
+    {
+        pAdapter->hAdapter = pOpenData->hAdapter;
+        pAdapter->uIfVersion = pOpenData->Interface;
+        pAdapter->uRtVersion= pOpenData->Version;
+        pAdapter->RtCallbacks = *pOpenData->pAdapterCallbacks;
+
+        pOpenData->hAdapter = pAdapter;
+        pOpenData->pAdapterFuncs->pfnGetCaps = vboxWddmDispGetCaps;
+        pOpenData->pAdapterFuncs->pfnCreateDevice = vboxWddmDispCreateDevice;
+        pOpenData->pAdapterFuncs->pfnCloseAdapter = vboxWddmDispCloseAdapter;
+        pOpenData->DriverVersion = D3D_UMD_INTERFACE_VERSION;
+
+        /* try enable the 3D */
+        hr = VBoxDispD3DOpen(&pAdapter->D3D);
+        Assert(hr == S_OK);
+        if (hr == S_OK)
+        {
+            hr = pAdapter->D3D.pfnDirect3DCreate9Ex(D3D_SDK_VERSION, &pAdapter->pD3D9If);
+            Assert(hr == S_OK);
+            if (hr == S_OK)
+            {
+                vboxVDbgPrint(("<== "__FUNCTION__", SUCCESS 3D Enabled, pAdapter (0x%p)\n", pAdapter));
+                return S_OK;
+            }
+            else
+                vboxVDbgPrintR((__FUNCTION__": pfnDirect3DCreate9Ex failed, hr (%d)\n", hr));
+        }
+        else
+            vboxVDbgPrintR((__FUNCTION__": VBoxDispD3DOpen failed, hr (%d)\n", hr));
+
+        vboxVDbgPrint(("<== "__FUNCTION__", SUCCESS 3D DISABLED, pAdapter (0x%p)\n", pAdapter));
+        return S_OK;
+//        RTMemFree(pAdapter);
+    }
+    else
     {
         vboxVDbgPrintR((__FUNCTION__": RTMemAllocZ returned NULL\n"));
-        return E_OUTOFMEMORY;
+        hr = E_OUTOFMEMORY;
     }
 
-    pAdapter->hAdapter = pOpenData->hAdapter;
-    pAdapter->uIfVersion = pOpenData->Interface;
-    pAdapter->uRtVersion= pOpenData->Version;
-    pAdapter->RtCallbacks = *pOpenData->pAdapterCallbacks;
-
-    pOpenData->hAdapter = pAdapter;
-    pOpenData->pAdapterFuncs->pfnGetCaps = vboxWddmDispGetCaps;
-    pOpenData->pAdapterFuncs->pfnCreateDevice = vboxWddmDispCreateDevice;
-    pOpenData->pAdapterFuncs->pfnCloseAdapter = vboxWddmDispCloseAdapter;
-    pOpenData->DriverVersion = D3D_UMD_INTERFACE_VERSION;
-
-    vboxVDbgPrint(("<== "__FUNCTION__", pAdapter(0x%p)\n", pAdapter));
-
-    return S_OK;
+    vboxVDbgPrint(("<== "__FUNCTION__", FAILURE, hr (%d)\n", hr));
+
+    return hr;
 }
 

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

@@ -16 +16 @@
 #define ___VBoxDispD3D_h___
 
-#ifdef DEBUG
-# define VBOXWDDMDISP_DEBUG
-#endif
+#include "VBoxDispD3DIf.h"
+
+#include <iprt/cdefs.h>
 
 typedef struct VBOXWDDMDISP_ADAPTER
@@ -25 +25 @@
     UINT uIfVersion;
     UINT uRtVersion;
+    VBOXDISPD3D D3D;
+    IDirect3D9Ex * pD3D9If;
     D3DDDI_ADAPTERCALLBACKS RtCallbacks;
 } VBOXWDDMDISP_ADAPTER, *PVBOXWDDMDISP_ADAPTER;
@@ -40 +42 @@
 } VBOXWDDMDISP_DEVICE, *PVBOXWDDMDISP_DEVICE;
 
-#ifdef VBOXWDDMDISP_DEBUG
-VOID vboxVDbgDoPrint(LPCSTR szString, ...);
-
-#define vboxVDbgBreak() AssertBreakpoint()
-#define vboxVDbgPrint(_m) \
-    do { \
-        vboxVDbgDoPrint _m ; \
-    } while (0)
-#define vboxVDbgPrintR vboxVDbgPrint
-#define vboxVDbgPrintF vboxVDbgPrint
-#else
-#define vboxVDbgBreak() do {} while (0)
-#define vboxVDbgPrint(_m)  do {} while (0)
-#define vboxVDbgPrintR vboxVDbgPrint
-#define vboxVDbgPrintF vboxVDbgPrint
-#endif
+DECLINLINE(bool) vboxDispD3DIs3DEnabled(VBOXWDDMDISP_ADAPTER * pAdapter)
+{
+    return pAdapter->pD3D9If;
+}
 
 #endif /* #ifndef ___VBoxDispD3D_h___ */

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVbva.cpp

@@ -266 +266 @@
     Assert (pRecord && (pRecord->cbRecord & VBVA_F_RECORD_PARTIAL));
 
-    dfprintf((__FUNCTION__": VW %d\n", cb));
+//    dfprintf((__FUNCTION__": VW %d\n", cb));
 
     cbHwBufferAvail = vboxHwBufferAvail (pVBVA);