Changeset 50429 in vbox

Timestamp:

Feb 12, 2014 3:55:20 PM (11 years ago)

Author:

vboxsync

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

92218

Message:

crOpenGL: assertion fixes

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/state_tracker/state_snapshot.c (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (1 diff)

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c

@@ -1449 +1449 @@
             {
                 GLboolean fIsNew = crHashtableAllocRegisterKey(pHash, i);
+#if 0 //def DEBUG_misha
                 CRASSERT(fIsNew);
+#endif
             }
         }

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

@@ -177 +177 @@
     /* synchronize with reality */
     fOldEnableDiff = crStateEnableDiffOnMakeCurrent(GL_FALSE);
-    Assert(cr_server.MainContextInfo.pContext);
-    crStateMakeCurrent(cr_server.MainContextInfo.pContext);
+    if(cr_server.MainContextInfo.pContext)
+        crStateMakeCurrent(cr_server.MainContextInfo.pContext);
     crStateEnableDiffOnMakeCurrent(fOldEnableDiff);