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

Timestamp:

Apr 12, 2019 10:03:24 AM (6 years ago)

Author:

vboxsync

Message:

GuestHost/OpenGL,HostServices/SharedOpenGL: Updates bugref:9407

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserverlib/server_dispatch.py (modified) (2 diffs)
• crserverlib/server_dispatch_header.py (modified) (1 diff)
• unpacker/unpack.py (modified) (1 diff)
• unpacker/unpack_arrays.c (modified) (17 diffs)

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

@@ -35 +35 @@
     if wrap:
         print('#if defined(CR_%s)' % wrap)
-    print('void SERVER_DISPATCH_APIENTRY crServerDispatch%s(%s)' % ( func_name, apiutil.MakeDeclarationString( params ) ))
+    print('void SERVER_DISPATCH_APIENTRY crServerDispatch%s(%s)' % ( func_name, apiutil.MakeDeclarationStringForDispatcher( params ) ))
     print('{')
-    print('\tcrState%s(%s);' % (func_name, apiutil.MakeCallString( params ) ))
-    print('\tcr_server.head_spu->dispatch_table.%s(%s);' % (func_name, apiutil.MakeCallString( params ) ))
+    print('\tcrState%s(%s);' % (func_name, apiutil.MakeCallStringForDispatcher( params ) ))
+    print('\tcr_server.head_spu->dispatch_table.%s(%s);' % (func_name, apiutil.MakeCallStringForDispatcher( params ) ))
     print('}')
     if wrap:
@@ -109 +109 @@
         print('\t%s' % (condition))
         print('\t{')
-        print('\t\tcr_server.head_spu->dispatch_table.%s(%s);' % (func_name, apiutil.MakeCallString(params) ))
+        print('\t\tcr_server.head_spu->dispatch_table.%s(%s);' % (func_name, apiutil.MakeCallStringForDispatcher(params) ))
         print("\t\tcr_server.current.c.%s.%s%s = cr_unpackData;" % (name,type,array))
         print('\t}')

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

@@ -41 +41 @@
         return_type = apiutil.ReturnType(func_name)
         
-        print('%s SERVER_DISPATCH_APIENTRY crServerDispatch%s(%s);' % (return_type, func_name, apiutil.MakeDeclarationString( params )))
+        print('%s SERVER_DISPATCH_APIENTRY crServerDispatch%s(%s);' % (return_type, func_name, apiutil.MakeDeclarationStringForDispatcher( params )))
 
 print("""

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

@@ -122 +122 @@
     else:
         print("\t", end="")
-    print("cr_unpackDispatch.%s(%s);" % (func_name, apiutil.MakeCallString(params)))
+    print("cr_unpackDispatch.%s(%s);" % (func_name, apiutil.MakeCallStringForDispatcher(params)))
 
 

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

@@ -26 +26 @@
     GLsizei stride = READ_DATA( 16, GLsizei );
     GLintptrARB pointer = (GLintptrARB) READ_DATA( 20, GLuint );
-    cr_unpackDispatch.VertexPointer( size, type, stride, (void *) pointer );
+    cr_unpackDispatch.VertexPointer( size, type, stride, (void *) pointer, false /*fRealPtr*/ );
 }
 
@@ -35 +35 @@
     GLsizei stride = READ_DATA( 16, GLsizei );
     GLintptrARB pointer = READ_DATA( 20, GLuint );
-    cr_unpackDispatch.TexCoordPointer( size, type, stride, (void *) pointer );
+    cr_unpackDispatch.TexCoordPointer( size, type, stride, (void *) pointer, false /*fRealPtr*/ );
 }
 
@@ -43 +43 @@
     GLsizei stride = READ_DATA( 12, GLsizei );
     GLintptrARB pointer = READ_DATA( 16, GLuint );
-    cr_unpackDispatch.NormalPointer( type, stride, (void *) pointer );
+    cr_unpackDispatch.NormalPointer( type, stride, (void *) pointer, false /*fRealPtr*/ );
 }
 
@@ -51 +51 @@
     GLsizei stride = READ_DATA( 12, GLsizei );
     GLintptrARB pointer = READ_DATA( 16, GLuint );
-    cr_unpackDispatch.IndexPointer( type, stride, (void *) pointer );
+    cr_unpackDispatch.IndexPointer( type, stride, (void *) pointer, false /*fRealPtr*/ );
 }
 
@@ -58 +58 @@
     GLsizei stride = READ_DATA( 8, GLsizei );
     GLintptrARB pointer = READ_DATA( 12, GLuint );
-    cr_unpackDispatch.EdgeFlagPointer( stride, (void *) pointer );
+    cr_unpackDispatch.EdgeFlagPointer( stride, (void *) pointer, false /*fRealPtr*/ );
 }
 
@@ -67 +67 @@
     GLsizei stride = READ_DATA( 16, GLsizei );
     GLintptrARB pointer = READ_DATA( 20, GLuint );
-    cr_unpackDispatch.ColorPointer( size, type, stride, (void *) pointer );
+    cr_unpackDispatch.ColorPointer( size, type, stride, (void *) pointer, false /*fRealPtr*/ );
 }
 
@@ -75 +75 @@
     GLsizei stride = READ_DATA( 12, GLsizei );
     GLintptrARB pointer = READ_DATA( 16, GLuint );
-    cr_unpackDispatch.FogCoordPointerEXT( type, stride, (void *) pointer );
+    cr_unpackDispatch.FogCoordPointerEXT( type, stride, (void *) pointer, false /*fRealPtr*/ );
 }
 
@@ -84 +84 @@
     GLsizei stride = READ_DATA( 16, GLsizei );
     GLintptrARB pointer = READ_DATA( 20, GLuint );
-    cr_unpackDispatch.SecondaryColorPointerEXT( size, type, stride, (void *) pointer );
+    cr_unpackDispatch.SecondaryColorPointerEXT( size, type, stride, (void *) pointer, false /*fRealPtr*/ );
 }
 
@@ -95 +95 @@
     GLsizei stride = READ_DATA( 24, GLsizei );
     GLintptrARB pointer = READ_DATA( 28, GLuint );
-    cr_unpackDispatch.VertexAttribPointerARB( index, size, type, normalized, stride, (void *) pointer );
+    cr_unpackDispatch.VertexAttribPointerARB( index, size, type, normalized, stride, (void *) pointer, false /*fRealPtr*/ );
 }
 
@@ -105 +105 @@
     GLsizei stride = READ_DATA( 20, GLsizei );
     GLintptrARB pointer = READ_DATA( 24, GLuint );
-    cr_unpackDispatch.VertexAttribPointerNV( index, size, type, stride, (void *) pointer );
+    cr_unpackDispatch.VertexAttribPointerNV( index, size, type, stride, (void *) pointer, false /*fRealPtr*/ );
 }
 
@@ -113 +113 @@
     GLsizei stride = READ_DATA( 12, GLsizei );
     GLintptrARB pointer = READ_DATA( 16, GLuint );
-    cr_unpackDispatch.InterleavedArrays( format, stride, (void *) pointer );
+    cr_unpackDispatch.InterleavedArrays( format, stride, (void *) pointer, false /*fRealPtr*/ );
 }
 
@@ -162 +162 @@
 static void crUnpackSetClientPointerByIndex(int index, GLint size, 
                                             GLenum type, GLboolean normalized,
-                                            GLsizei stride, const GLvoid *pointer, CRClientState *c)
+                                            GLsizei stride, const GLvoid *pointer, CRClientState *c, int fRealPtr)
 {
     /*crDebug("crUnpackSetClientPointerByIndex: %i(s=%i, t=0x%x, n=%i, str=%i) -> %p", index, size, type, normalized, stride, pointer);*/
@@ -171 +171 @@
         {
             case 0:
-                cr_unpackDispatch.VertexPointer(size, type, stride, pointer);
+                cr_unpackDispatch.VertexPointer(size, type, stride, pointer, fRealPtr);
                 break;
             case 1:
-                cr_unpackDispatch.ColorPointer(size, type, stride, pointer);
+                cr_unpackDispatch.ColorPointer(size, type, stride, pointer, fRealPtr);
                 break;
             case 2:
-                cr_unpackDispatch.FogCoordPointerEXT(type, stride, pointer);
+                cr_unpackDispatch.FogCoordPointerEXT(type, stride, pointer, fRealPtr);
                 break;
             case 3:
-                cr_unpackDispatch.SecondaryColorPointerEXT(size, type, stride, pointer);
+                cr_unpackDispatch.SecondaryColorPointerEXT(size, type, stride, pointer, fRealPtr);
                 break;
             case 4:
-                cr_unpackDispatch.EdgeFlagPointer(stride, pointer);
+                cr_unpackDispatch.EdgeFlagPointer(stride, pointer, fRealPtr);
                 break;
             case 5:
-                cr_unpackDispatch.IndexPointer(type, stride, pointer);
+                cr_unpackDispatch.IndexPointer(type, stride, pointer, fRealPtr);
                 break;
             case 6:
-                cr_unpackDispatch.NormalPointer(type, stride, pointer);
+                cr_unpackDispatch.NormalPointer(type, stride, pointer, fRealPtr);
                 break;
         }
@@ -200 +200 @@
             cr_unpackDispatch.ClientActiveTextureARB(GL_TEXTURE0_ARB+index-7);
         }
-        cr_unpackDispatch.TexCoordPointer(size, type, stride, pointer);
+        cr_unpackDispatch.TexCoordPointer(size, type, stride, pointer, fRealPtr);
         if ((index-7)!=curTexUnit)
         {
@@ -209 +209 @@
     {
         cr_unpackDispatch.VertexAttribPointerARB(index-7-CR_MAX_TEXTURE_UNITS,
-                                                 size, type, normalized, stride, pointer);
+                                                 size, type, normalized, stride, pointer, fRealPtr);
     }
 }
@@ -265 +265 @@
                 /*crDebug("crUnpackExtendLockArraysEXT: old cp(%i): en/l=%i(%i) p=%p size=%i type=0x%x n=%i str=%i pp=%p pstr=%i",
                         index, cp->enabled, cp->locked, cp->p, cp->size, cp->type, cp->normalized, cp->stride, cp->prevPtr, cp->prevStride);*/
-                crUnpackSetClientPointerByIndex(index, cp->size, cp->type, cp->normalized, 0, data, c);
+                crUnpackSetClientPointerByIndex(index, cp->size, cp->type, cp->normalized, 0, data, c, 1 /*fRealPtr*/);
                 /*crDebug("crUnpackExtendLockArraysEXT: new cp(%i): en/l=%i(%i) p=%p size=%i type=0x%x n=%i str=%i pp=%p pstr=%i",
                         index, cp->enabled, cp->locked, cp->p, cp->size, cp->type, cp->normalized, cp->stride, cp->prevPtr, cp->prevStride);*/
@@ -305 +305 @@
             /*crDebug("crUnpackExtendUnlockArraysEXT: old cp(%i): en/l=%i(%i) p=%p size=%i type=0x%x n=%i str=%i pp=%p pstr=%i",
                     i, cp->enabled, cp->locked, cp->p, cp->size, cp->type, cp->normalized, cp->stride, cp->prevPtr, cp->prevStride);*/
-            crUnpackSetClientPointerByIndex(i, cp->size, cp->type, cp->normalized, cp->prevStride, cp->prevPtr, c);
+            unsigned char *prevPtr = cp->prevPtr;
+            int fRealPtr = cp->fPrevRealPtr;
+            cp->prevPtr = NULL;
+            cp->fPrevRealPtr = 0;
+            crUnpackSetClientPointerByIndex(i, cp->size, cp->type, cp->normalized, cp->prevStride, prevPtr, c, cp->fPrevRealPtr);
             /*crDebug("crUnpackExtendUnlockArraysEXT: new cp(%i): en/l=%i(%i) p=%p size=%i type=0x%x n=%i str=%i pp=%p pstr=%i",
                     i, cp->enabled, cp->locked, cp->p, cp->size, cp->type, cp->normalized, cp->stride, cp->prevPtr, cp->prevStride);*/