From: Carl Worth <cworth@cworth.org>
Date: Thu, 30 May 2013 21:22:24 +0000 (-0700)
Subject: Add two missing GL draw wrappers
X-Git-Url: https://git.cworth.org/git?p=fips;a=commitdiff_plain;h=c10f5f0deb7723aa8462ce52e58f40c9490a8340

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 8e8b64d..323c321 100644
--- 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 f703cb7..f3473e2 100644
--- 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;