Add two missing GL draw wrappers

The following two functions are now added:

	glMultiDrawArraysIndirect
	glMultiDrawElementsIndirect

These were previously commented out with a "FIXME" comment. I don't
recall now what original problem I ran into when trying to add these,
but they seem to work fine now.

diff --git a/glwrap.c b/glwrap.c
index 8e8b64d193194aa8ffd7a127e00d59448d8f0a36..323c321107c5d37dc7cd0775e0475afe431869c5 100644 (file)
--- a/glwrap.c
+++ b/glwrap.c
@@ -157,13 +157,12 @@ glMultiModeDrawArraysIBM (const GLenum *mode, const GLint *first,
                     first, count, primcount, modestride);
 }
 
-/* FIXME?
 void
-glMultiDrawArraysIndirect (...)
+glMultiDrawArraysIndirect (GLenum mode, const void *indirect,
+                          GLsizei drawcount, GLsizei stride)
 {
-       TIMED_DEFER (glMultiDrawArraysIndirect, ...);
+       TIMED_DEFER (glMultiDrawArraysIndirect, mode, indirect, drawcount, stride);
 }
-*/
 
 void
 glMultiDrawArraysIndirectAMD (GLenum mode, const GLvoid *indirect,
@@ -303,13 +302,13 @@ glMultiModeDrawElementsIBM (const GLenum *mode, const GLsizei *count,
                     type, indices, primcount, modestride);
 }
 
-/* FIXME?
 void
-glMultiDrawElementsIndirect (...)
+glMultiDrawElementsIndirect (GLenum mode, GLenum type, const void *indirect,
+                            GLsizei drawcount, GLsizei stride)
 {
-       TIMED_DEFER (glMultiDrawElementsIndirect, ...);
+       TIMED_DEFER (glMultiDrawElementsIndirect, mode, type,
+                    indirect, drawcount, stride);
 }
-*/
 
 void
 glMultiDrawElementsIndirectAMD (GLenum mode, GLenum type,

diff --git a/libfips.sym b/libfips.sym
index f703cb761039ec1c685bbc6c0041bb557ba295d5..f3473e243e437a332c7589f07b4b8bba0280efea 100644 (file)
--- a/libfips.sym
+++ b/libfips.sym
@@ -13,6 +13,7 @@ global:
        glMultiDrawArrays;
        glMultiDrawArraysEXT;
        glMultiModeDrawArraysIBM;
+       glMultiDrawArraysIndirect;
        glMultiDrawArraysIndirectAMD;
        glDrawElements;
        glDrawElementsBaseVertex;
@@ -30,6 +31,7 @@ global:
        glMultiDrawElementsBaseVertex;
        glMultiDrawElementsEXT;
        glMultiModeDrawElementsIBM;
+       glMultiDrawElementsIndirect;
        glMultiDrawElementsIndirectAMD;
        glCallList;
        glCallLists;