儲存庫 vbox 的更動 18540

時間撮記:

2009-3-30 下午12:53:54 (16 年 以前)

作者:

vboxsync

訊息:

crOpenGL: another fix for intel drivers

檔案:

• trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_wgl.c (修改) (3 筆差異)

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_wgl.c

@@ -313 +313 @@
 bSetupPixelFormat( HDC hdc, GLbitfield visAttribs )
 {
-    if (render_spu.ws.wglChoosePixelFormatEXT) 
-        return bSetupPixelFormatEXT( hdc, visAttribs );
-    else
-        return bSetupPixelFormatNormal( hdc, visAttribs );
+    /* According to http://www.opengl.org/resources/faq/technical/mswindows.htm
+       we shouldn't be using wgl functions to setup pixel formats unless we're loading ICD driver.
+       In particular, bSetupPixelFormatEXT bugs with Intel drivers.
+     */
+    bSetupPixelFormatNormal(hdc, visAttribs);
 }
 
@@ -851 +852 @@
 
             if (!context->hRC) {
-                context->hRC = render_spu.ws.wglCreateContext(window->device_context);
+                context->hRC = render_spu.ws.wglCreateContext(context->visual->device_context);
                 if (!context->hRC)
                 {
@@ -861 +862 @@
             {
                 DWORD err = GetLastError();
-                crWarning("Render SPU: (MakeCurrent) failed to make 0x%x, 0x%x current with 0x%x error.", window->device_context, context->hRC, err);
-
-                /* Workaround for Intel drivers, which report support for wglChoosePixelFormatEXT, but it doesn't work. */
-                if ((err==ERROR_INVALID_PIXEL_FORMAT) && (!context->everCurrent))
-                {
-                    crDebug("Trying to resetup pixel format");
-
-                    render_spu.ws.wglDeleteContext(context->hRC);
-                    DeleteDC(window->device_context);
-                    window->device_context = GetDC(window->hWnd);
-                    crDebug("Render SPU: MakeCurrent made new window DC: 0x%x", window->device_context);
-                    
-                    if (!bSetupPixelFormatNormal(window->device_context, context->visual->visAttribs))
-                    {
-                        crWarning("Failed to resetup pixel format");
-                    }
-
-                    context->hRC = render_spu.ws.wglCreateContext(window->device_context);
-                    if (!context->hRC)
-                    {
-                        crError("Render SPU: (MakeCurrent) Couldn't create the context for the window (error 0x%x)", GetLastError());
-                    }
-
-                    if (!render_spu.ws.wglMakeCurrent(window->device_context, context->hRC))
-                    {
-                        crError("Can't make context current");
-                    }
-                    else
-                    {
-                        crInfo("Render SPU: (MakeCurrent) passed after pixel format reset");
-                    }
-                }
+                crError("Render SPU: (MakeCurrent) failed to make 0x%x, 0x%x current with 0x%x error.", window->device_context, context->hRC, err);
             }
         }