Changeset 51005 in vbox for trunk/src/VBox/GuestHost/OpenGL/state_tracker

Timestamp:

Apr 9, 2014 8:58:50 AM (11 years ago)

Author:

vboxsync

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

93199

Message:

DevVGA/crOpenGL: create worker thread when needed only; saved state; bugfixes (to be continued)

File:

• trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_init.c (modified) (2 diffs)

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

@@ -678 +678 @@
  * As above, but don't call crStateSwitchContext().
  */
-void crStateSetCurrent( CRContext *ctx )
+static void crStateSetCurrentEx( CRContext *ctx, GLboolean fCleanupDefault )
 {
     CRContext *current = GetCurrentContext();
 
-    if (ctx == NULL)
+    if (ctx == NULL && !fCleanupDefault)
         ctx = defaultContext;
 
     if (current == ctx)
         return; /* no-op */
-
-    CRASSERT(ctx);
 
 #ifdef CHROMIUM_THREADSAFE
@@ -696 +694 @@
 #endif
 
-    /* ensure matrix state is also current */
-    crStateMatrixMode(ctx->transform.matrixMode);
+    if (ctx)
+    {
+        /* ensure matrix state is also current */
+        crStateMatrixMode(ctx->transform.matrixMode);
+    }
+}
+
+void crStateSetCurrent( CRContext *ctx )
+{
+    crStateSetCurrentEx( ctx, GL_FALSE );
+}
+
+void crStateCleanupCurrent()
+{
+    crStateSetCurrentEx( NULL, GL_TRUE );
 }