Changeset 25155 in vbox for trunk/src/VBox/HostServices

Timestamp:

Dec 3, 2009 12:23:36 AM (15 years ago)

Author:

vboxsync

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

55577

Message:

crOpenGL: better fix for blank screen after compiz loading

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserver/crservice.cpp (modified) (1 diff)
• crserverlib/server_stream.c (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

@@ -71 +71 @@
 
 static const char* gszVBoxOGLSSMMagic = "***OpenGL state data***";
-#define SHCROGL_SSM_VERSION 11
+#define SHCROGL_SSM_VERSION 12
 
 typedef struct

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

@@ -425 +425 @@
         crStateMakeCurrent( cr_server.curClient->currentCtx );
 #else
-        crStateMakeCurrent( cr_server.curClient->currentCtx );
-
         /* Check if the current window is the one that the client wants to
          * draw into.  If not, dispatch a MakeCurrent to activate the proper
@@ -441 +439 @@
              }
         }
+
+        crStateMakeCurrent( cr_server.curClient->currentCtx );
 #endif