Changeset 52451 in vbox for trunk/src/VBox/Additions/common/crOpenGL/pack

Timestamp:

Aug 21, 2014 7:20:27 PM (11 years ago)

Author:

vboxsync

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

95662

Message:

crOpenGL: command blocks flushing

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/Additions/common/crOpenGL/pack/packspu_misc.c (modified) (1 diff)
• src/VBox/Additions/common/crOpenGL/pack/packspu_net.c (modified) (1 diff)

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_misc.c

@@ -565 +565 @@
     }
 
-#ifdef DEBUG_misha
-    if (pCurState->lists.currentIndex)
-    {
-        WARN(("GetError called in DisplayList"));
-    }
-#endif
-
-    if (!pCurState->lists.currentIndex || !(g_u32VBoxHostCaps & CR_VBOX_CAP_CMDBLOCKS))
-    {
-        packspuFlush( (void *) thread );
-        CRPACKSPU_WRITEBACK_WAIT(thread, writeback);
-        if (pack_spu.swap)
-        {
-            return_val = (GLenum) SWAP32(return_val);
-        }
-    }
-    else
-    {
-        return_val = GL_NO_ERROR;
+    packspuFlush( (void *) thread );
+    CRPACKSPU_WRITEBACK_WAIT(thread, writeback);
+
+    if (pack_spu.swap)
+    {
+        return_val = (GLenum) SWAP32(return_val);
     }
 

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_net.c

@@ -250 +250 @@
     {
         g_u32VBoxHostCaps = crNetHostCapsGet();
-        if (g_u32VBoxHostCaps & CR_VBOX_CAP_CMDBLOCKS)
-            crPackCmdBlocksEnable();
+        crPackCapsSet(g_u32VBoxHostCaps);
     }
 }