Changeset 47116 in vbox for trunk/src/VBox

Timestamp:

Jul 12, 2013 12:35:16 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: saved state and dummy mural/context fixes

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/include/cr_version.h (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (9 diffs)
• HostServices/SharedOpenGL/crserverlib/server_muralfbo.c (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_presenter.cpp (modified) (1 diff)

trunk/src/VBox/GuestHost/OpenGL/include/cr_version.h

@@ -35 +35 @@
 /* dirty bits are not needed for now, remove */
 #define SHCROGL_SSM_VERSION_WITHOUT_DIRTY_BITS                      38
-#define SHCROGL_SSM_VERSION                                         38
+/* dummy windows and contexts have 0 external IDs, so never get stored to the state */
+#define SHCROGL_SSM_VERSION_WITH_FIXED_DUMMYIDS                     39
+#define SHCROGL_SSM_VERSION                                         39
 
 /* These define the Chromium release number.

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

@@ -154 +154 @@
      * and generally this should be zeroed up */
     cr_server.currentCtxInfo = NULL;
-    cr_server.currentWindow = 0;
+    cr_server.currentWindow = -1;
     cr_server.currentNativeWindow = 0;
     cr_server.currentMural = NULL;
@@ -348 +348 @@
         cr_server.u32Caps = 0;
 #ifdef DEBUG_misha
-        cr_server.u32Caps = CR_VBOX_CAP_TEX_PRESENT;
+//        cr_server.u32Caps = CR_VBOX_CAP_TEX_PRESENT;
 #endif
     }
@@ -460 +460 @@
         cr_server.u32Caps = 0;
 #ifdef DEBUG_misha
-        cr_server.u32Caps = CR_VBOX_CAP_TEX_PRESENT;
+//        cr_server.u32Caps = CR_VBOX_CAP_TEX_PRESENT;
 #endif
     }
@@ -1011 +1011 @@
             return NULL;
         }
-        id = crServerMuralInit(pMural, "", visualBits, -1, GL_TRUE);
+        id = crServerMuralInit(pMural, "", visualBits, 0, GL_TRUE);
         if (id < 0)
         {
@@ -1707 +1707 @@
             AssertRCReturn(rc, rc);
 
-            if (pClient->currentCtxInfo && pClient->currentCtxInfo->pContext && pClient->currentContextNumber>=0)
+            if (pClient->currentCtxInfo && pClient->currentCtxInfo->pContext && pClient->currentContextNumber > 0)
             {
                 b = crHashtableGetDataKey(cr_server.contextTable, pClient->currentCtxInfo, &key);
@@ -1715 +1715 @@
             }
 
-            if (pClient->currentMural && pClient->currentWindow>=0)
+            if (pClient->currentMural && pClient->currentWindow > 0)
             {
                 b = crHashtableGetDataKey(cr_server.muralTable, pClient->currentMural, &key);
@@ -2460 +2460 @@
         }
 
-        CRASSERT(cr_server.currentCtxInfo == &cr_server.MainContextInfo);
+        CRASSERT(!uiNumElems || cr_server.currentCtxInfo == &cr_server.MainContextInfo);
 
         cr_server.curClient = NULL;
@@ -2520 +2520 @@
             cr_server.curClient = pClient;
 
-            if (client.currentCtxInfo && client.currentContextNumber>=0)
+            if (client.currentCtxInfo && client.currentContextNumber > 0)
             {
                 rc = crServerLsrDataGetMem(&Reader, &ctxID, sizeof(ctxID));
@@ -2531 +2531 @@
             }
 
-            if (client.currentMural && client.currentWindow>=0)
+            if (client.currentMural && client.currentWindow > 0)
             {
                 rc = crServerLsrDataGetMem(&Reader, &winID, sizeof(winID));

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

@@ -379 +379 @@
 void crServerRedirMuralFBO(CRMuralInfo *mural, GLuint redir)
 {
-    if (!mural->CreateInfo.externalID)
-    {
-        crWarning("trying to change redir setting for internal mural %d", mural->spuWindow);
-        return;
-    }
-
     if (mural->fPresentMode == redir)
     {
 //        if (redir)
 //            crWarning("crServerRedirMuralFBO called with the same redir status %d", redir);
+        return;
+    }
+
+    if (!mural->CreateInfo.externalID)
+    {
+        crWarning("trying to change redir setting for internal mural %d", mural->spuWindow);
         return;
     }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp

@@ -63 +63 @@
 {
     const GLint visBits = cr_server.MainContextInfo.CreateInfo.visualBits;
-    if (crServerMuralInit(&pDisplay->Mural, "", visBits, -1, GL_FALSE) < 0)
+    if (crServerMuralInit(&pDisplay->Mural, "", visBits, 0, GL_FALSE) < 0)
     {
         crWarning("crServerMuralInit failed!");