Make definition of context_t private to context.c

[fips] / glwrap.c

diff --git a/glwrap.c b/glwrap.c
index aa560386feca11db8abbf18a3a5412f14be5fbe3..39a784fb2088ce592e08fb54fb6659f3c9419884 100644 (file)
--- a/glwrap.c
+++ b/glwrap.c
@@ -45,19 +45,34 @@
 
 #include "glwrap.h"
 
-#include "metrics.h"
+#include "context.h"
+
+/* As of glext.h version 20131008 some types changed.
+ *
+ * I have no idea why some internalFormats changed from GLenum to
+ * GLint while others changed from GLint to GLenum.
+ *
+ * But, in order to compile with either version, we track these.
+ */
+#if GL_GLEXT_VERSION >= 20131008
+#define GLint_or_enum GLenum
+#define GLenum_or_int GLint
+#else
+#define GLint_or_enum GLint
+#define GLenum_or_int GLenum
+#endif
 
 static void *gl_handle;
 
 /* Switch metrics operation persistently, (until next SWITCH) */
 #define SWITCH_METRICS_OP(op)                  \
-       metrics_counter_stop ();                \
-       metrics_set_current_op (op);            \
-       metrics_counter_start ();
+       context_counter_stop ();                \
+       context_set_current_op (op);            \
+       context_counter_start ();
 
 /* Switch metrics operation temporarily, see RESTORE_METRICS_OP */
 #define SAVE_THEN_SWITCH_METRICS_OP(op)                        \
-       metrics_op_t save = metrics_get_current_op ();  \
+       metrics_op_t save = context_get_current_op ();  \
        SWITCH_METRICS_OP (op);
 
 /* Switch back to metrics operation saved by SAVE_THEN_SWITCH_METRICS_OP */
@@ -972,7 +987,8 @@ glTexImage2D (GLenum target, GLint level, GLint internalFormat,
 
 void
 glTexImage2DMultisample (GLenum target, GLsizei samples,
-                        GLint internalformat, GLsizei width, GLsizei height,
+                        GLint_or_enum internalformat,
+                        GLsizei width, GLsizei height,
                         GLboolean fixedsamplelocations)
 {
        SAVE_THEN_SWITCH_METRICS_OP (METRICS_OP_TEX_IMAGE);
@@ -1025,7 +1041,8 @@ glTexImage3DEXT (GLenum target, GLint level, GLenum internalformat,
 }
 
 void
-glTexImage3DMultisample (GLenum target, GLsizei samples, GLint internalformat,
+glTexImage3DMultisample (GLenum target, GLsizei samples,
+                        GLint_or_enum internalformat,
                         GLsizei width, GLsizei height, GLsizei depth,
                         GLboolean fixedsamplelocations)
 {
@@ -1496,7 +1513,8 @@ glCompressedTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level,
 
 void
 glMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level,
-                     GLenum internalformat, GLsizei width, GLint border,
+                     GLenum_or_int internalformat,
+                     GLsizei width, GLint border,
                      GLenum format, GLenum type, const GLvoid *pixels)
 {
        SAVE_THEN_SWITCH_METRICS_OP (METRICS_OP_TEX_IMAGE);
@@ -1509,7 +1527,8 @@ glMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level,
 
 void
 glMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level,
-                     GLenum internalformat, GLsizei width, GLsizei height,
+                     GLenum_or_int internalformat,
+                     GLsizei width, GLsizei height,
                      GLint border, GLenum format, GLenum type,
                      const GLvoid *pixels)
 {
@@ -1524,7 +1543,8 @@ glMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level,
 
 void
 glMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level,
-                     GLenum internalformat, GLsizei width, GLsizei height,
+                     GLenum_or_int internalformat,
+                     GLsizei width, GLsizei height,
                      GLsizei depth, GLint border, GLenum format,
                      GLenum type, const GLvoid *pixels)
 {