Bail on pointer arrays.

diff --git a/glretrace.py b/glretrace.py
index 792bdd8924556361c5cb0b0820c4b8a958a29e84..549a14e0fe0d63017429179111a54575381d4a51 100644 (file)
--- a/glretrace.py
+++ b/glretrace.py
@@ -40,6 +40,16 @@ class GlRetracer(Retracer):
             "glBufferRegionEnabled",
         ]
 
+    def call_function(self, function):
+        if function.name in ("glDrawArrays", "glDrawElements", "glDrawRangeElements", "glMultiDrawElements"):
+            print '    GLint __array_buffer = 0;'
+            print '    glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &__array_buffer);'
+            print '    if (!__array_buffer) {'
+            self.fail_function(function)
+            print '    }'
+
+        Retracer.call_function(self, function)
+
     def extract_arg(self, function, arg, arg_type, lvalue, rvalue):
         if function.name in [
             "glColorPointer",

diff --git a/retrace.py b/retrace.py
index 6dfd0a26e73d3141bae34a0800a1e50afdf3413c..0c148551da8da2084c40512b954e07c4eda95ddd 100644 (file)
--- a/retrace.py
+++ b/retrace.py
@@ -173,14 +173,8 @@ class Retracer:
                 success = False
                 print '    %s = 0; // FIXME' % arg.name
         if not success:
-            print '    std::cerr << "warning: unsupported call %s\\n";' % function.name
-            print '    return;'
-        arg_names = ", ".join([arg.name for arg in function.args])
-        if function.type is not stdapi.Void:
-            print '    %s __result;' % (function.type)
-            print '    __result = %s(%s);' % (function.name, arg_names)
-        else:
-            print '    %s(%s);' % (function.name, arg_names)
+            self.fail_function(function)
+        self.call_function(function)
         for arg in function.args:
             if arg.output:
                 arg_type = ConstRemover().visit(arg.type)
@@ -200,9 +194,21 @@ class Retracer:
         print '}'
         print
 
+    def fail_function(self, function):
+        print '    std::cerr << "warning: unsupported call %s\\n";' % function.name
+        print '    return;'
+
     def extract_arg(self, function, arg, arg_type, lvalue, rvalue):
         ValueExtractor().visit(arg_type, lvalue, rvalue)
 
+    def call_function(self, function):
+        arg_names = ", ".join([arg.name for arg in function.args])
+        if function.type is not stdapi.Void:
+            print '    %s __result;' % (function.type)
+            print '    __result = %s(%s);' % (function.name, arg_names)
+        else:
+            print '    %s(%s);' % (function.name, arg_names)
+
     def filter_function(self, function):
         return True