Changeset 52263 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Aug 4, 2014 12:02:28 PM (11 years ago)

Author:

vboxsync

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

95360

Message:

CrOpenGL: fix err state sync

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/GuestHost/OpenGL/include/cr_glstate.h (modified) (1 diff)
• src/VBox/GuestHost/OpenGL/state_tracker/state_diff.c (modified) (2 diffs)
• src/VBox/GuestHost/OpenGL/state_tracker/state_lists.c (modified) (2 diffs)

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

@@ -223 +223 @@
 
 void crStateSyncHWErrorState(CRContext *ctx);
+GLenum crStateCleanHWErrorState();
+
+#define CR_STATE_CLEAN_HW_ERR_WARN(_s) do {\
+            GLenum _err = crStateCleanHWErrorState(); \
+            if (_err != GL_NO_ERROR) { \
+                static int _cErrPrints = 0; \
+                if (_cErrPrints < 5) { \
+                    ++_cErrPrints; \
+                    WARN(("%s %#x, ignoring.. (%d out of 5)", _s, _err, _cErrPrints)); \
+                } \
+            } \
+        } while (0)
 
 DECLEXPORT(void) crStateFlushFunc( CRStateFlushFunc ff );

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

@@ -588 +588 @@
 }
 
+GLenum crStateCleanHWErrorState()
+{
+    GLenum err;
+    while ((err = diff_api.GetError()) != GL_NO_ERROR)
+    {
+        static int cErrPrints = 0;
+#ifndef DEBUG_misha
+        if (cErrPrints < 5)
+#endif
+        {
+            ++cErrPrints;
+            WARN(("cleaning gl error (0x%x), ignoring.. (%d out of 5) ..", err, cErrPrints));
+        }
+    }
+
+    return err;
+}
+
+
 void crStateSwitchPrepare(CRContext *toCtx, CRContext *fromCtx, GLuint idDrawFBO, GLuint idReadFBO)
 {
@@ -606 +625 @@
         return;
 
-    if (g_bVBoxEnableDiffOnMakeCurrent && fromCtx && toCtx != fromCtx)
-    {
-        GLenum err;
-        while ((err = diff_api.GetError()) != GL_NO_ERROR)
-        {
-            static int cErrPrints = 0;
-#ifndef DEBUG_misha
-            if (cErrPrints < 5)
-#endif
-            {
-                ++cErrPrints;
-                crWarning("gl error (0x%x) after context switch, ignoring.. (%d out of 5) ..", err, cErrPrints);
-            }
-        }
-    }
 #ifdef CR_EXT_framebuffer_object
     crStateFramebufferObjectReenableHW(fromCtx, toCtx, idDrawFBO, idReadFBO);
 #endif
-}
+
+    if (g_bVBoxEnableDiffOnMakeCurrent && fromCtx && toCtx != fromCtx)
+    {
+        CR_STATE_CLEAN_HW_ERR_WARN("error on make current");
+    }
+}

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

@@ -176 +176 @@
 
     CRASSERT(g_bVBoxEnableDiffOnMakeCurrent);
+
+    crStateSyncHWErrorState(g);
 
     if (CHECKDIRTY(sb->buffer.dirty, negbitID))
@@ -1204 +1206 @@
         }
     }
+
+    CR_STATE_CLEAN_HW_ERR_WARN("error on hw sync");
 }