Changeset 26048 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jan 26, 2010 2:21:26 PM (15 years ago)

Author:

vboxsync

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

56961

Message:

crOpenGL: track bound textures on client side, add debug check for client side tracked states

Location:

trunk/src/VBox/Additions/common/crOpenGL/pack

Files:

• packspu_get.py (modified) (3 diffs)
• packspu_special (modified) (1 diff)
• packspu_texture.c (modified) (1 diff)

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_get.py

@@ -16 +16 @@
 #include "cr_packfunctions.h"
 #include "cr_net.h"
+#include "cr_mem.h"
 #include "packspu_proto.h"
 """
@@ -95 +96 @@
         || pname == GL_ACTIVE_TEXTURE_ARB
 #endif
+        || pname == GL_TEXTURE_BINDING_1D
+        || pname == GL_TEXTURE_BINDING_2D
+#ifdef CR_NV_texture_rectangle
+        || pname == GL_TEXTURE_BINDING_RECTANGLE_NV
+#endif
+#ifdef CR_ARB_texture_cube_map
+        || pname == GL_TEXTURE_BINDING_CUBE_MAP_ARB
+#endif
         )
         {
+#ifndef DEBUG
             crState%s( pname, params );
             return;
+#else
+            %s localparams;
+            localparams = (%s) crAlloc(__numValues(pname) * sizeof(*localparams));
+            crState%s(pname, localparams);
+            crPack%s(%s, &writeback);
+            packspuFlush( (void *) thread );
+            while (writeback)
+                crNetRecv();
+            for (i=0; i<__numValues(pname); ++i)
+            {
+                if (localparams[i] != params[i])
+                {
+                    crWarning("Incorrect local state in %s for %%x param %%i", pname, i);
+                }
+            }
+            crFree(localparams);
+            return;
+#endif
+            
         }
-            """ % func_name
+            """ % (func_name, params[-1][1], params[-1][1], func_name, func_name, apiutil.MakeCallString(params), func_name)
         params.append( ("&writeback", "foo", 0) )
         print '\tif (pack_spu.swap)'
@@ -113 +142 @@
         print '\twhile (writeback)'
         print '\t\tcrNetRecv();'
+
+
+
         lastParamName = params[-2][0]
         if return_type != 'void':

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_special

@@ -94 +94 @@
 FramebufferRenderbufferEXT
 CheckFramebufferStatusEXT
+BindTexture

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

@@ -31 +31 @@
     crPackActiveTextureARB(texture);
 }
+
+void PACKSPU_APIENTRY packspu_BindTexture(GLenum target, GLuint texture)
+{
+    crStateBindTexture(target, texture);
+    crPackBindTexture(target, texture);
+}