Changeset 21308 in vbox for trunk/src/VBox/HostServices

Timestamp:

Jul 7, 2009 10:49:52 AM (16 years ago)

Author:

vboxsync

Message:

crOpenGL: use host side VBO when possible

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserverlib/get_sizes.py (modified) (1 diff)
• crserverlib/server_simpleget.py (modified) (1 diff)
• unpacker/unpack.py (modified) (4 diffs)
• unpacker/unpack_arrays.c (modified) (1 diff)
• unpacker/unpack_bufferobject.c (modified) (1 diff)
• unpacker/unpacker.h (modified) (1 diff)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/get_sizes.py

@@ -403 +403 @@
             return temp->num_values;
     }
-    crWarning( "Invalid pname to __numValues: 0x%x\\n", (int) pname );
+    crDebug( "Invalid pname to __numValues: 0x%x\\n", (int) pname );
     return 0;
 }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_simpleget.py

@@ -49 +49 @@
     print '\t(void) params;'
     print '\tget_values = (%s *) crAlloc( tablesize );' % types[index]
+    print '\tif (tablesize>0)'
     print '\tcr_server.head_spu->dispatch_table.%s( pname, get_values );' % func_name
     print """

trunk/src/VBox/HostServices/SharedOpenGL/unpacker/unpack.py

@@ -28 +28 @@
 
 static void crUnpackExtend(void);
+static void crUnpackExtendDbg(void);
+
+/*#define CR_UNPACK_DEBUG_OPCODES*/
+/*#define CR_UNPACK_DEBUG_LAST_OPCODES*/
 """
 
-
+nodebug_opcodes = [
+    "CR_MULTITEXCOORD2FARB_OPCODE",
+    "CR_VERTEX3F_OPCODE",
+    "CR_NORMAL3F_OPCODE",
+    "CR_COLOR4UB_OPCODE",
+    "CR_LOADIDENTITY_OPCODE",
+    "CR_MATRIXMODE_OPCODE",
+    "CR_LOADMATRIXF_OPCODE",
+    "CR_DISABLE_OPCODE",
+    "CR_COLOR4F_OPCODE",
+    "CR_ENABLE_OPCODE",
+    "CR_BEGIN_OPCODE",
+    "CR_END_OPCODE",
+    "CR_SECONDARYCOLOR3FEXT_OPCODE"
+]
+
+nodebug_extopcodes = [
+    "CR_ACTIVETEXTUREARB_EXTEND_OPCODE"
+]
 
 #
@@ -199 +221 @@
     cr_unpackData = (const unsigned char *)data;
 
+    crDebug("crUnpack: %d opcodes", num_opcodes);
+
     for (i = 0 ; i < num_opcodes ; i++)
     {
@@ -211 +235 @@
     if "pack" in apiutil.ChromiumProps(func_name):
         print '\t\t\tcase %s:' % apiutil.OpcodeName( func_name )
-#        print '\t\t\t\tcrDebug("Unpack: %s");' % apiutil.OpcodeName( func_name )
+        if not apiutil.OpcodeName(func_name) in nodebug_opcodes:
+            print """
+#ifdef CR_UNPACK_DEBUG_LAST_OPCODES
+                if (i==(num_opcodes-1))
+#endif
+#if defined(CR_UNPACK_DEBUG_OPCODES) || defined(CR_UNPACK_DEBUG_LAST_OPCODES)
+                crDebug("Unpack: %s");
+#endif """ % apiutil.OpcodeName(func_name)
         print '\t\t\t\tcrUnpack%s(); \n\t\t\t\tbreak;' % func_name
 
 print """       
-            case CR_EXTEND_OPCODE: crUnpackExtend(); break;
+            case CR_EXTEND_OPCODE:
+                #ifdef CR_UNPACK_DEBUG_OPCODES 
+                    crUnpackExtendDbg();
+                #else
+                # ifdef CR_UNPACK_DEBUG_LAST_OPCODES
+                    if (i==(num_opcodes-1)) crUnpackExtendDbg();
+                    else
+                # endif
+                    crUnpackExtend();
+                #endif
+                break;
             default:
                 crError( "Unknown opcode: %d", *unpack_opcodes );
@@ -263 +304 @@
     INCR_VAR_PTR();
 }"""
+
+print 'static void crUnpackExtendDbg(void)'
+print '{'
+print '\tGLenum extend_opcode = %s;' % ReadData( 4, 'GLenum' );
+print ''
+print '\t/*crDebug(\"Unpacking extended opcode \%d", extend_opcode);*/'
+print '\tswitch( extend_opcode )'
+print '\t{'
+
+
+#
+# Emit switch statement for extended opcodes
+#
+for func_name in keys:
+    if "extpack" in apiutil.ChromiumProps(func_name):
+        print '\t\tcase %s:' % apiutil.ExtendedOpcodeName( func_name )
+        if not apiutil.ExtendedOpcodeName(func_name) in nodebug_extopcodes:
+            print '\t\t\tcrDebug("Unpack: %s");' % apiutil.ExtendedOpcodeName( func_name )
+        print '\t\t\tcrUnpackExtend%s( );' % func_name
+        print '\t\t\tbreak;'
+
+print """       default:
+            crError( "Unknown extended opcode: %d", (int) extend_opcode );
+            break;
+    }
+    INCR_VAR_PTR();
+}"""

trunk/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_arrays.c

@@ -117 +117 @@
 void crUnpackExtendDrawElements(void)
 {
-    GLenum mode = READ_DATA( 8, GLenum );
-    GLsizei count = READ_DATA( 12, GLsizei );
-    GLenum type = READ_DATA( 16, GLenum );
+    GLenum mode         = READ_DATA( 8, GLenum );
+    GLsizei count       = READ_DATA( 12, GLsizei );
+    GLenum type         = READ_DATA( 16, GLenum );
     GLintptrARB indices = READ_DATA( 20, GLintptrARB );
-    cr_unpackDispatch.DrawElements( mode, count, type, (void *) indices);
+    void * indexptr;
+#ifdef CR_ARB_vertex_buffer_object
+    GLboolean hasidxdata = READ_DATA(24, GLboolean);
+    indexptr = hasidxdata ? DATA_POINTER(24+sizeof(GLboolean), void) : (void*)indices;
+#else
+    indexptr = DATA_POINTER(24, void);
+#endif
+    /*crDebug("DrawElements: count=%i, indexptr=%p, hasidx=%p", count, indexptr, hasidxdata);*/
+    cr_unpackDispatch.DrawElements(mode, count, type, indexptr);
 }
 
 void crUnpackExtendDrawRangeElements(void)
 {
-    GLenum mode = READ_DATA( 8, GLenum );
-    GLuint start = READ_DATA( 12, GLuint );
-    GLuint end = READ_DATA( 16, GLuint );
-    GLsizei count = READ_DATA( 20, GLsizei );
-    GLenum type = READ_DATA( 24, GLenum );
+    GLenum mode         = READ_DATA( 8, GLenum );
+    GLuint start        = READ_DATA( 12, GLuint );
+    GLuint end          = READ_DATA( 16, GLuint );
+    GLsizei count       = READ_DATA( 20, GLsizei );
+    GLenum type         = READ_DATA( 24, GLenum );
     GLintptrARB indices = READ_DATA( 28, GLintptrARB );
-    cr_unpackDispatch.DrawRangeElements( mode, start, end, count, type, (void *) indices);
+    void * indexptr;
+#ifdef CR_ARB_vertex_buffer_object
+    GLboolean hasidxdata = READ_DATA(32, GLboolean);
+    indexptr = hasidxdata ? DATA_POINTER(32+sizeof(GLboolean), void) : (void*)indices;
+#else
+    indexptr = DATA_POINTER(32, void);
+#endif
+    cr_unpackDispatch.DrawRangeElements(mode, start, end, count, type, indexptr);
 }
 

trunk/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_bufferobject.c

@@ -32 +32 @@
 void crUnpackExtendBufferDataARB( void )
 {
-    GLenum target = READ_DATA( sizeof(int) + 4, GLenum );
-    GLsizeiptrARB size = READ_DATA( sizeof(int) + 8, GLsizeiptrARB );
-    GLenum usage = READ_DATA( sizeof(int) + 12, GLenum );
-    GLvoid *data = DATA_POINTER( sizeof(int) + 16, GLvoid );
+    GLenum target      = READ_DATA(sizeof(int) + 4, GLenum);
+    GLsizeiptrARB size = READ_DATA(sizeof(int) + 8, GLsizeiptrARB);
+    GLenum usage       = READ_DATA(sizeof(int) + 12, GLenum);
+    GLboolean hasdata  = READ_DATA(sizeof(int) + 16, GLboolean);
+    GLvoid *data       = DATA_POINTER(sizeof(int) + 16 + sizeof(GLboolean), GLvoid);
 
     CRASSERT(sizeof(GLsizeiptrARB) == 4);
-    CRASSERT(usage == GL_STATIC_DRAW_ARB);
+    /*@todo, why?*/
+    /*CRASSERT(usage == GL_STATIC_DRAW_ARB);*/
 
-    cr_unpackDispatch.BufferDataARB( target, size, data, usage );
+    cr_unpackDispatch.BufferDataARB(target, size, hasdata ? data:NULL, usage);
 }
 

trunk/src/VBox/HostServices/SharedOpenGL/unpacker/unpacker.h

@@ -13 +13 @@
 #define DLLDATA(type) DECLEXPORT(type)
 
+#include "cr_version.h"
 #include "cr_unpack.h"
 #include "unpack_extend.h"