Handle glDraw*BaseInstance.

diff --git a/glretrace.py b/glretrace.py
index 761fe23f4faf9a27d496ebcd0b9b02ec800fe2d8..1d916ee797b6d0025626ab326236353102fefdf2 100644 (file)
--- a/glretrace.py
+++ b/glretrace.py
@@ -78,6 +78,7 @@ class GlRetracer(Retracer):
         "glDrawArraysInstanced",
         "glDrawArraysInstancedARB",
         "glDrawArraysInstancedEXT",
+        "glDrawArraysInstancedBaseInstance",
         "glDrawMeshArraysSUN",
         "glMultiDrawArrays",
         "glMultiDrawArraysEXT",
@@ -90,11 +91,13 @@ class GlRetracer(Retracer):
         "glDrawElementsIndirect",
         "glDrawElementsInstanced",
         "glDrawElementsInstancedARB",
-        "glDrawElementsInstancedBaseVertex",
         "glDrawElementsInstancedEXT",
+        "glDrawElementsInstancedBaseVertex",
+        "glDrawElementsInstancedBaseInstance",
+        "glDrawElementsInstancedBaseVertexBaseInstance",
         "glDrawRangeElements",
-        "glDrawRangeElementsBaseVertex",
         "glDrawRangeElementsEXT",
+        "glDrawRangeElementsBaseVertex",
         "glMultiDrawElements",
         "glMultiDrawElementsBaseVertex",
         "glMultiDrawElementsEXT",

diff --git a/glsize.hpp b/glsize.hpp
index f5b2eb08afb339e69d4913f848a3367d921f4541..646899e934901117c805c2330d2d540e4387fb65 100644 (file)
--- a/glsize.hpp
+++ b/glsize.hpp
@@ -1,5 +1,6 @@
 /**************************************************************************
  *
+ * Copyright 2011 Jose Fonseca
  * Copyright 2010 VMware, Inc.
  * Copyright 2004 IBM Corporation
  * All Rights Reserved.
@@ -316,6 +317,7 @@ __glDrawElementsBaseVertex_maxindex(GLsizei count, GLenum type, const GLvoid *in
     if (!count) {
         return 0;
     }
+
     __glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING, &__element_array_buffer);
     if (__element_array_buffer) {
         // Read indices from index buffer object
@@ -376,12 +378,17 @@ __glDrawElementsBaseVertex_maxindex(GLsizei count, GLenum type, const GLvoid *in
 #define __glDrawRangeElements_maxindex(start, end, count, type, indices) __glDrawElements_maxindex(count, type, indices)
 #define __glDrawRangeElementsEXT_maxindex __glDrawRangeElements_maxindex
 
+/* FIXME take in consideration instancing */
 #define __glDrawArraysInstanced_maxindex(first, count, primcount) __glDrawArrays_maxindex(first, count)
 #define __glDrawElementsInstanced_maxindex(count, type, indices, primcount) __glDrawElements_maxindex(count, type, indices)
 #define __glDrawElementsInstancedBaseVertex_maxindex(count, type, indices, primcount, basevertex) __glDrawElementsBaseVertex_maxindex(count, type, indices, basevertex)
 #define __glDrawRangeElementsInstanced_maxindex(start, end, count, type, indices, primcount) __glDrawRangeElements_maxindex(start, end, count, type, indices)
 #define __glDrawRangeElementsInstancedBaseVertex_maxindex(start, end, count, type, indices, primcount, basevertex) __glDrawRangeElementsBaseVertex_maxindex(start, end, count, type, indices, basevertex)
 
+#define __glDrawArraysInstancedBaseInstance_maxindex(first, count, primcount, baseinstance) __glDrawArrays_maxindex(first, count)
+#define __glDrawElementsInstancedBaseInstance_maxindex(count, type, indices, primcount, baseinstance) __glDrawElements_maxindex(count, type, indices)
+#define __glDrawElementsInstancedBaseVertexBaseInstance_maxindex(count, type, indices, primcount, basevertex, baseinstance) __glDrawElementsBaseVertex_maxindex(count, type, indices, basevertex)
+
 #define __glDrawArraysInstancedARB_maxindex __glDrawArraysInstanced_maxindex
 #define __glDrawElementsInstancedARB_maxindex __glDrawElementsInstanced_maxindex
 #define __glDrawArraysInstancedEXT_maxindex __glDrawArraysInstanced_maxindex

diff --git a/gltrace.py b/gltrace.py
index 08fef0026a5bb1a14bba5e9a2b0fd8dd7ef91b86..69be821ed15f67a1aad27d16eae76be3ea29a0ed 100644 (file)
--- a/gltrace.py
+++ b/gltrace.py
@@ -330,12 +330,15 @@ class GlTracer(Tracer):
         'glMultiDrawArrays',
         'glMultiDrawElements',
         'glDrawArraysInstanced',
+        "glDrawArraysInstancedBaseInstance",
         'glDrawElementsInstanced',
         'glDrawArraysInstancedARB',
         'glDrawElementsInstancedARB',
         'glDrawElementsBaseVertex',
         'glDrawRangeElementsBaseVertex',
         'glDrawElementsInstancedBaseVertex',
+        "glDrawElementsInstancedBaseInstance",
+        "glDrawElementsInstancedBaseVertexBaseInstance",
         'glMultiDrawElementsBaseVertex',
         'glDrawArraysIndirect',
         'glDrawElementsIndirect',