Changeset 43182 in vbox

Timestamp:

Sep 4, 2012 7:21:41 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

80568

Message:

crOpenGL: 1. VRDP+3D fixes, 2. Generic bugfixes, 3. Intel GPU-related fixes

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserverlib/server_context.c (modified) (2 diffs)
• crserverlib/server_main.c (modified) (3 diffs)
• crserverlib/server_muralfbo.c (modified) (3 diffs)
• crserverlib/server_window.c (modified) (4 diffs)
• render/renderspu.h (modified) (1 diff)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_context.c

@@ -55 +55 @@
             return -1;
         }
+        cr_server.MainContextInfo.pContext = crStateCreateContext(&cr_server.limits, visualBits, NULL);
+        CRASSERT(cr_server.MainContextInfo.pContext);
         cr_server.firstCallCreateContext = GL_FALSE;
         fFirst = GL_TRUE;
@@ -265 +267 @@
         }
         pNode = pNode->next;
+    }
+
+    if (cr_server.currentCtxInfo == crCtxInfo)
+    {
+        cr_server.currentCtxInfo = &cr_server.MainContextInfo;
     }
 }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

@@ -310 +310 @@
      */
     cr_server.contextTable = crAllocHashtable();
-    cr_server.MainContextInfo.pContext = crStateCreateContext( &cr_server.limits,
-                                                   CR_RGB_BIT | CR_DEPTH_BIT, NULL );
     cr_server.curClient->currentCtxInfo = &cr_server.MainContextInfo;
 
@@ -388 +386 @@
      */
     cr_server.contextTable = crAllocHashtable();
-    cr_server.MainContextInfo.pContext = crStateCreateContext( &cr_server.limits,
-                                                   CR_RGB_BIT | CR_DEPTH_BIT, NULL );
 //    cr_server.pContextCreateInfoTable = crAllocHashtable();
     cr_server.pWindowCreateInfoTable = crAllocHashtable();
@@ -1395 +1391 @@
 
     if (mural->screenId != *sIndex)
-        return;
-
-    if (!mural->width || !mural->height)
         return;
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c

@@ -101 +101 @@
     int overlappingScreenCount, primaryS, i;
 
+    if (!mural->width || !mural->height)
+        return;
+
     if (cr_server.screenCount<2 && !cr_server.bForceOffscreenRendering)
     {
@@ -252 +255 @@
         }
 
-        crStateGetCurrent()->buffer.width = 0;
-        crStateGetCurrent()->buffer.height = 0;
+        if (cr_server.curClient && cr_server.curClient->currentMural == mural)
+        {
+            crStateGetCurrent()->buffer.width = 0;
+            crStateGetCurrent()->buffer.height = 0;
+        }
     }
     else
@@ -271 +277 @@
         }
 
-        crStateGetCurrent()->buffer.width = mural->width;
-        crStateGetCurrent()->buffer.height = mural->height;
+        if (cr_server.curClient && cr_server.curClient->currentMural == mural)
+        {
+            crStateGetCurrent()->buffer.width = mural->width;
+            crStateGetCurrent()->buffer.height = mural->height;
+        }
     }
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_window.c

@@ -103 +103 @@
 
         crServerSetupOutputRedirect(mural);
-
-        crStateGetCurrent()->buffer.width = mural->width;
-        crStateGetCurrent()->buffer.height = mural->height;
     }
 
@@ -170 +167 @@
     {
         cr_server.currentWindow = -1;
-        crServerRedirMuralFBO(mural, GL_FALSE);
-        crServerDeleteMuralFBO(mural);
-    }
+    }
+
+    crServerRedirMuralFBO(mural, GL_FALSE);
+    crServerDeleteMuralFBO(mural);
 
     crDebug("CRServer: Destroying window %d (spu window %d)", window, mural->spuWindow);
@@ -262 +260 @@
     mural->height = height;
 
-    crStateGetCurrent()->buffer.width = mural->width;
-    crStateGetCurrent()->buffer.height = mural->height;
-
-    if (!width || !height)
-    {
-        crServerDispatchWindowVisibleRegion(window, 0, NULL);
-        return;
+    if (cr_server.curClient && cr_server.curClient->currentMural == mural)
+    {
+        crStateGetCurrent()->buffer.width = mural->width;
+        crStateGetCurrent()->buffer.height = mural->height;
     }
 
@@ -302 +297 @@
     mural->gY = y;
 
-    if (!mural->width || !mural->height)
-        return;
-
     crServerCheckMuralGeometry(mural);
 }

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.h

@@ -90 +90 @@
     HWND hWnd;
     HDC device_context;
+    HRGN hRgn;
 #elif defined(DARWIN)
 # ifndef VBOX_WITH_COCOA_QT