Changeset 43181 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/render

Timestamp:

Sep 4, 2012 7:20:15 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL/win: Intel GPU work-arounds/fixes

File:

• trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_wgl.c (modified) (11 diffs)

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

@@ -413 +413 @@
     window->hWnd = NULL;
     window->visual = NULL;
+    if (window->hRgn)
+    {
+        DeleteObject(window->hRgn);
+        window->hRgn = NULL;
+    }
 }
 
@@ -687 +692 @@
     int       window_plus_caption_height;
 
+    window->hRgn = NULL;
     window->visual = visual;
     window->nativeWindow = 0;
@@ -835 +841 @@
     }
 
-    if (showIt) {
-        /* NO ERROR CODE FOR SHOWWINDOW */
-        crDebug( "Render SPU: Showing the window" );
-        crDebug("renderspu_SystemCreateWindow: showwindow: %x", window->hWnd);
-        ShowWindow( window->hWnd, SW_SHOWNORMAL );
-    }
+    /* Intel drivers require a window to be visible for proper 3D rendering,
+     * so set it visible and handle the visibility with visible regions (see below) */
+    ShowWindow( window->hWnd, SW_SHOWNORMAL );
 
     SetForegroundWindow( window->hWnd );
@@ -863 +866 @@
         crError( "Render SPU: Couldn't set up the device context!  Yikes!" );
         return GL_FALSE;
+    }
+
+    window->visible = showIt;
+
+    if (!showIt)
+    {
+        renderspu_SystemShowWindow( window, 0 );
+        if (window->height <= 0 || window->width <= 0)
+        {
+            renderspu_SystemWindowSize(window,
+                    window->width > 0 ? window->width : 4,
+                    window->height > 0 ? window->height : 4);
+        }
+    }
+    else
+    {
+        crDebug( "Render SPU: Showing the window" );
+        crDebug("renderspu_SystemCreateWindow: showwindow: %x", window->hWnd);
     }
 
@@ -879 +900 @@
     int       window_plus_caption_height;
 
+    window->hRgn = NULL;
     window->visual = visual;
     window->nativeWindow = 0;
@@ -1082 +1104 @@
     }
 
-    if (showIt) {
-        /* NO ERROR CODE FOR SHOWWINDOW */
-        crDebug( "Render SPU: Showing the window" );
-        crDebug("renderspu_SystemVBoxCreateWindow: showwindow: %x", window->hWnd);
-        ShowWindow( window->hWnd, SW_SHOWNORMAL );
-    }
+    /* Intel drivers require a window to be visible for proper 3D rendering,
+     * so set it visible and handle the visibility with visible regions (see below) */
+    ShowWindow( window->hWnd, SW_SHOWNORMAL );
 
     //SetForegroundWindow( visual->hWnd );
@@ -1112 +1131 @@
     }
 
+    window->visible = showIt;
+
+    if (!showIt)
+    {
+        renderspu_SystemShowWindow( window, 0 );
+        if (window->height <= 0 || window->width <= 0)
+        {
+            renderspu_SystemWindowSize(window,
+                    window->width > 0 ? window->width : 4,
+                    window->height > 0 ? window->height : 4);
+        }
+    }
+    else
+    {
+        crDebug( "Render SPU: Showing the window" );
+        crDebug("renderspu_SystemCreateWindow: showwindow: %x", window->hWnd);
+    }
+
     return GL_TRUE;
 }
-
 
 /* Either show or hide the render SPU's window. */
@@ -1122 +1158 @@
     {
         crDebug("SHOW renderspu_SystemShowWindow: %x", window->hWnd);
-        ShowWindow( window->hWnd, SW_SHOWNORMAL );
+        SetWindowRgn(window->hWnd, window->hRgn, true);
     }
     else
     {
+        HRGN hRgn;
         crDebug("HIDE renderspu_SystemShowWindow: %x", window->hWnd);
-        ShowWindow( window->hWnd, SW_HIDE );
-    }
+        hRgn = CreateRectRgn(0, 0, 0, 0);
+        SetWindowRgn(window->hWnd, hRgn, true);
+        DeleteObject(hRgn);
+    }
+    window->visible = showIt;
 }
 
@@ -1223 +1263 @@
              * various tables. This is hack which just hides the root case.
              */
-            crDebug("Recreating window in renderspu_SystemMakeCurrent\n");
+            crWarning("Recreating window in renderspu_SystemMakeCurrent\n");
             renderspu_SystemDestroyWindow( window );
             renderspu_SystemVBoxCreateWindow( context->visual, window->visible, window );
@@ -1411 +1451 @@
     CRASSERT(window->visual);
 
+    if (window->hRgn)
+    {
+        DeleteObject(window->hRgn);
+        window->hRgn = NULL;
+    }
+
     hRgn = CreateRectRgn(0, 0, 0, 0);
 
@@ -1420 +1466 @@
     }
 
-    SetWindowRgn(window->hWnd, hRgn, true);
+    if (window->visible)
+        SetWindowRgn(window->hWnd, hRgn, true);
+
     crDebug("Render SPU: SetWindowRgn (%x, cRects=%i)", window->hWnd, cRects);
+
+    window->hRgn = hRgn;
 }