Merge branch 'd3dretrace'

[apitrace] / glretrace.py

diff --git a/glretrace.py b/glretrace.py
index cd7fe803267766954d6fd4e8450d9761c834ceb4..d91c8a25fe2ec2e68d39c89c15a2ada41e1b5f90 100644 (file)
--- a/glretrace.py
+++ b/glretrace.py
@@ -178,7 +178,7 @@ class GlRetracer(Retracer):
         is_misc_draw = function.name in self.misc_draw_function_names
 
         if is_array_pointer or is_draw_array or is_draw_elements:
-            print '    if (glretrace::parser.version < 1) {'
+            print '    if (retrace::parser.version < 1) {'
 
             if is_array_pointer or is_draw_array:
                 print '        GLint __array_buffer = 0;'
@@ -391,7 +391,8 @@ class GlRetracer(Retracer):
         # Handle pointer with offsets into the current pack pixel buffer
         # object.
         if function.name in self.pack_function_names and arg.output:
-            self.extractOpaqueArg(function, arg, arg_type, lvalue, rvalue)
+            assert isinstance(arg_type, (stdapi.Pointer, stdapi.Array, stdapi.Blob, stdapi.Opaque))
+            print '    %s = static_cast<%s>((%s).toPointer());' % (lvalue, arg_type, rvalue)
             return
 
         if arg.type is glapi.GLlocation \