Distinguish linear pointers.

[apitrace] / glretrace.py

diff --git a/glretrace.py b/glretrace.py
index a6414e41aeee5c1fef060c9eb99cb80bd9b6cc60..e650c54a7fdb4c4ad939f9324cc12463c5cc0424 100644 (file)
--- a/glretrace.py
+++ b/glretrace.py
@@ -154,6 +154,7 @@ class GlRetracer(Retracer):
     map_function_names = set([
         'glMapBuffer',
         'glMapBufferARB',
+        'glMapBufferOES',
         'glMapBufferRange',
         'glMapNamedBufferEXT',
         'glMapNamedBufferRangeEXT'
@@ -162,6 +163,7 @@ class GlRetracer(Retracer):
     unmap_function_names = set([
         'glUnmapBuffer',
         'glUnmapBufferARB',
+        'glUnmapBufferOES',
         'glUnmapNamedBufferEXT',
     ])
 
@@ -318,28 +320,30 @@ class GlRetracer(Retracer):
                 print r'    }'
             print '    }'
 
-            # Update buffer mappings
+            # Query the buffer length for whole buffer mappings
             if function.name in self.map_function_names:
-                print r'        if (__result) {'
-                print r'            unsigned long long __address = call.ret->toUIntPtr();'
-                if 'BufferRange' not in function.name:
-                    print r'            GLint length = 0;'
-                    if function.name == 'glMapBuffer':
-                        print r'            glGetBufferParameteriv(target, GL_BUFFER_SIZE, &length);'
+                if 'length' in function.argNames():
+                    assert 'BufferRange' in function.name
+                else:
+                    assert 'BufferRange' not in function.name
+                    print r'    GLint length = 0;'
+                    if function.name in ('glMapBuffer', 'glMapBufferOES'):
+                        print r'    glGetBufferParameteriv(target, GL_BUFFER_SIZE, &length);'
                     elif function.name == 'glMapBufferARB':
-                        print r'            glGetBufferParameterivARB(target, GL_BUFFER_SIZE_ARB, &length);'
+                        print r'    glGetBufferParameterivARB(target, GL_BUFFER_SIZE_ARB, &length);'
                     elif function.name == 'glMapNamedBufferEXT':
-                        print r'            glGetNamedBufferParameterivEXT(buffer, GL_BUFFER_SIZE, &length);'
+                        print r'    glGetNamedBufferParameterivEXT(buffer, GL_BUFFER_SIZE, &length);'
                     else:
                         assert False
-                print r'             retrace::addRegion(__address, __result, length);'
-                print r'        }'
+            # Destroy the buffer mapping
             if function.name in self.unmap_function_names:
                 print r'        GLvoid *ptr = NULL;'
                 if function.name == 'glUnmapBuffer':
                     print r'            glGetBufferPointerv(target, GL_BUFFER_MAP_POINTER, &ptr);'
                 elif function.name == 'glUnmapBufferARB':
                     print r'            glGetBufferPointervARB(target, GL_BUFFER_MAP_POINTER_ARB, &ptr);'
+                elif function.name == 'glUnmapBufferOES':
+                    print r'            glGetBufferPointervOES(target, GL_BUFFER_MAP_POINTER_OES, &ptr);'
                 elif function.name == 'glUnmapNamedBufferEXT':
                     print r'            glGetNamedBufferPointervEXT(buffer, GL_BUFFER_MAP_POINTER, &ptr);'
                 else:
@@ -365,12 +369,12 @@ class GlRetracer(Retracer):
             return
 
         if arg.type is glapi.GLlocation \
-           and 'program' not in [arg.name for arg in function.args]:
+           and 'program' not in function.argNames():
             print '    GLint program = -1;'
             print '    glGetIntegerv(GL_CURRENT_PROGRAM, &program);'
         
         if arg.type is glapi.GLlocationARB \
-           and 'programObj' not in [arg.name for arg in function.args]:
+           and 'programObj' not in function.argNames():
             print '    GLhandleARB programObj = glGetHandleARB(GL_PROGRAM_OBJECT_ARB);'
 
         Retracer.extractArg(self, function, arg, arg_type, lvalue, rvalue)