Changeset 29452 in vbox for trunk

Timestamp:

May 13, 2010 9:04:58 PM (15 years ago)

Author:

vboxsync

Message:

wddm/3d: make wine directly use VBoxOGL.dll instead of opengl32.dll

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Display/wddm/VBoxDispD3D.cpp (modified) (3 diffs)
• Wine/Makefile.kmk (modified) (1 diff)
• Wine/wined3d/directx.c (modified) (1 diff)

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

@@ -887 +887 @@
     vboxVDbgPrint(("==> "__FUNCTION__", hAdapter(0x%p)\n", hAdapter));
 
-    AssertBreakpoint();
+//    AssertBreakpoint();
 
     PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)RTMemAllocZ(sizeof (VBOXWDDMDISP_DEVICE));
@@ -1031 +1031 @@
     vboxVDbgPrint(("==> "__FUNCTION__", hAdapter(0x%p)\n", hAdapter));
 
-    AssertBreakpoint();
+//    AssertBreakpoint();
 
     PVBOXWDDMDISP_ADAPTER pAdapter = (PVBOXWDDMDISP_ADAPTER)hAdapter;
@@ -1052 +1052 @@
     vboxVDbgPrint(("==> "__FUNCTION__"\n"));
 
-    AssertBreakpoint();
+//    AssertBreakpoint();
 
     HRESULT hr = S_OK;

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

@@ -129 +129 @@
  wined3d_DEFS        += WINE_NO_DEBUG_MSGS
 endif
+ifdef VBOXWDDM
+ wined3d_DEFS        += VBOXWDDM 
+endif
 wined3d_INCS         := $(PATH_SUB_CURRENT)/include
 wined3d_SOURCES      := \

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/directx.c

@@ -5075 +5075 @@
 #ifdef USE_WIN32_OPENGL
 #define USE_GL_FUNC(pfn) pfn = (void*)GetProcAddress(mod_gl, #pfn);
+#ifdef VBOXWDDM
+        BOOL (APIENTRY *pDrvValidateVersion)(DWORD) DECLSPEC_HIDDEN;
+        mod_gl = LoadLibraryA("VBoxOGL.dll");
+#else
         mod_gl = LoadLibraryA("opengl32.dll");
+#endif
         if(!mod_gl) {
             ERR("Can't load opengl32.dll!\n");
             goto nogl_adapter;
         }
+#ifdef VBOXWDDM
+        /* init properly */
+        pDrvValidateVersion = (void*)GetProcAddress(mod_gl, "DrvValidateVersion");
+        if(!pDrvValidateVersion) {
+            ERR("Can't get DrvValidateVersion\n");
+            goto nogl_adapter;
+        }
+        if(!pDrvValidateVersion(1)) {
+            ERR("DrvValidateVersion FAILED\n");
+            goto nogl_adapter;
+        }
+#endif
 #else
 #define USE_GL_FUNC(pfn) pfn = (void*)pwglGetProcAddress(#pfn);