X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glwrap.c;h=bcb8111a03e990baa9298c3c939f2f77494a11ad;hb=6475596e655063624dbf54359bd2a45de6a17dd1;hp=8e8b64d193194aa8ffd7a127e00d59448d8f0a36;hpb=499af6e2043af80750f5b2a2866ebb430e085851;p=fips diff --git a/glwrap.c b/glwrap.c index 8e8b64d..bcb8111 100644 --- a/glwrap.c +++ b/glwrap.c @@ -19,12 +19,6 @@ * THE SOFTWARE. */ -#include "fips.h" - -#include "glwrap.h" - -#include "metrics.h" - /* The prototypes for some OpenGL functions changed at one point from: * * const void* *indices @@ -45,6 +39,12 @@ #define GL_GLEXT_PROTOTYPES #include +#include "fips.h" + +#include "glwrap.h" + +#include "metrics.h" + #include "dlwrap.h" static int inside_new_list = 0; @@ -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,