Changeset 11411 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Aug 14, 2008 12:45:11 AM (16 years ago)

Author:

vboxsync

Message:

Fix startup failure and glGetString with NVidia drivers

File:

• trunk/src/VBox/HostServices/SharedOpenGL/glwindrv.cpp (modified) (8 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/glwindrv.cpp

@@ -57 +57 @@
 
     hwnd = pClient->hwnd= CreateWindow("VBoxOGL", "VirtualBox OpenGL",
-                                               WS_CAPTION | WS_POPUPWINDOW | WS_VISIBLE,
-                                               0, 0, 0, 0,
-                                        NULL, NULL, 0, NULL);
+                                       WS_CAPTION | WS_POPUPWINDOW | WS_VISIBLE,
+                                       0, 0, 0, 0,
+                                    NULL, NULL, 0, NULL);
     Assert(hwnd);
     while(true)
@@ -87 +87 @@
 int vboxglGlobalInit()
 {
+    Log(("vboxglGlobalInit\n"));
+
+    WNDCLASS wc;
+    HWND hWnd;
+
 #ifdef VBOX_OGL_DEBUG_WINDOW_OUTPUT
-    WNDCLASS wc;
-
     wc.style            = CS_OWNDC;
     wc.lpfnWndProc      = VBoxOGLWndProc;
@@ -105 +108 @@
     PIXELFORMATDESCRIPTOR pfd;
     int iFormat;
-    /** @todo should NOT use the desktop window -> crashes the Intel OpenGL driver */
-    HDC hdc = GetDC(0);
+
+    wc.style = CS_OWNDC;
+    wc.lpfnWndProc = DefWindowProc;
+    wc.cbClsExtra = 0;
+    wc.cbWndExtra = 0;
+    wc.hInstance = 0;
+    wc.hIcon = NULL;
+    wc.hCursor = NULL;
+    wc.hbrBackground = NULL;
+    wc.lpszMenuName = NULL;
+    wc.lpszClassName = "VBoxOGLDummy";
+    RegisterClass( &wc );
+
+    /* create dummy window to avoid Intel/Nvidia opengl drivers 
+     * problem with DC from desktop window */
+    hWnd = CreateWindow("VBoxOGLDummy", "", WS_POPUPWINDOW,
+            0, 0, 0, 0, NULL, NULL, 0, NULL );
+    Assert(hWnd);
+
+    HDC hdc = GetDC(hWnd);
 
     ZeroMemory(&pfd, sizeof(pfd));
@@ -126 +147 @@
     wglMakeCurrent(NULL, NULL);
     wglDeleteContext(hRC);
-    ReleaseDC(0, hdc);
+    ReleaseDC(hWnd, hdc);
+    DestroyWindow(hWnd);
 
     return VINF_SUCCESS;
@@ -138 +160 @@
 int vboxglGlobalUnload()
 {
-    Log(("vboxglGlobalUnload"));
+    Log(("vboxglGlobalUnload\n"));
 
     return VINF_SUCCESS;
@@ -154 +176 @@
     int iFormat;
 
-    /** @todo should NOT use the desktop window -> crashes the Intel OpenGL driver */
-    pClient->enable.hdc = GetDC(0);
+    if (!pClient->enable.hwnd) 
+    {
+        pClient->enable.hwnd = CreateWindow("VBoxOGLDummy", "", WS_POPUPWINDOW,
+                                             0, 0, 0, 0, NULL, NULL, 0, NULL );
+    }
+
+    Assert(pClient->enable.hwnd);
+    pClient->enable.hdc = GetDC(pClient->enable.hwnd);
 
     ZeroMemory(&pfd, sizeof(pfd));
@@ -184 +212 @@
     wglMakeCurrent(NULL, NULL);
     wglDeleteContext(pClient->enable.hglrc);
-    ReleaseDC(0, pClient->enable.hdc);
+    ReleaseDC(pClient->enable.hwnd, pClient->enable.hdc);
+    if (pClient->enable.hwnd)
+    {
+        DestroyWindow(pClient->enable.hwnd);
+        pClient->enable.hwnd = 0;
+    }   
     return VINF_SUCCESS;
 }
@@ -214 +247 @@
         if (pClient->hdc)
             ReleaseDC(pClient->hwnd, pClient->hdc);
-        PostMessage(pClient->hwnd, WM_CLOSE, 0, 0);
+        PostMessage(pClient->hwnd, WM_CLOSE, 0, 0);
         pClient->hwnd = 0;
     }