Changeset 20916 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Jun 25, 2009 9:18:46 AM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: fix memory corruption when querying for supported texture compression formats

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• get_components.py (modified) (1 diff)
• get_sizes.py (modified) (1 diff)
• server_simpleget.py (modified) (1 diff)

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

@@ -40 +40 @@
         'GL_TEXTURE_INTENSITY_SIZE': 1,
         'GL_TEXTURE_COMPONENTS': 1,
-        'GL_COMPRESSED_TEXTURE_FORMATS': 1,
         'GL_TEXTURE_RESIDENT': 1
 }

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

@@ -301 +301 @@
     'GL_POINT_SPRITE_ARB': (1, 'CR_ARB_point_sprite'),
     'GL_MAX_TEXTURE_LOD_BIAS_EXT': (1, 'CR_EXT_texture_lod_bias'),
-    'GL_COMPRESSED_TEXTURE_FORMATS_ARB': (1, 'CR_ARB_texture_compression'),
     'GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB': (1, 'CR_ARB_texture_compression'),
     'GL_PROGRAM_ERROR_POSITION_NV': (1, 'CR_NV_vertex_program'),

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

@@ -27 +27 @@
 
 for index in range(len(funcs)):
-        func_name = funcs[index]
-        params = apiutil.Parameters(func_name)
-        print 'void SERVER_DISPATCH_APIENTRY crServerDispatch%s( %s )' % ( func_name, apiutil.MakeDeclarationString(params))
-        print '{'
-        print '\t%s *get_values;' % types[index]
-        print '\tint tablesize = __numValues( pname ) * sizeof(%s);' % types[index]
-        print '\t(void) params;'
-        print '\tget_values = (%s *) crAlloc( tablesize );' % types[index]
-        print '\tcr_server.head_spu->dispatch_table.%s( pname, get_values );' % func_name
-        print '\tcrServerReturnValue( get_values, tablesize );'
-        print '\tcrFree(get_values);'
-        print '}\n'
+    func_name = funcs[index]
+    params = apiutil.Parameters(func_name)
+    print 'void SERVER_DISPATCH_APIENTRY crServerDispatch%s( %s )' % ( func_name, apiutil.MakeDeclarationString(params))
+    print '{'
+    print '\t%s *get_values;' % types[index]
+    print '\tint tablesize;'
+    print """
+    #ifdef CR_ARB_texture_compression
+    if (GL_COMPRESSED_TEXTURE_FORMATS_ARB == pname)
+    {
+        GLint numtexfmts = 0;
+        cr_server.head_spu->dispatch_table.GetIntegerv(GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB, &numtexfmts);
+        tablesize = numtexfmts * sizeof(%s);
+    }
+    else
+    #endif
+    {
+        tablesize = __numValues( pname ) * sizeof(%s);
+    }
+    """ % (types[index], types[index])
+    print '\t(void) params;'
+    print '\tget_values = (%s *) crAlloc( tablesize );' % types[index]
+    print '\tcr_server.head_spu->dispatch_table.%s( pname, get_values );' % func_name
+    print '\tcrServerReturnValue( get_values, tablesize );'
+    print '\tcrFree(get_values);'
+    print '}\n'