Trace right number of parameters in GL_EXT_direct_state_access.

1 files changed, 69 insertions, 112 deletions

diff --git a/glsize.hpp b/glsize.hpp
index 3941f78..a897c46 100644
--- a/glsize.hpp
+++ b/glsize.hpp
@@ -174,27 +174,18 @@ __glCallLists_size(GLsizei n, GLenum type)
     return n*__gl_type_size(type);
 }
 
-#define __glFogfv_size pname_size
-#define __glFogiv_size pname_size
+#define __glFogfv_size __gl_param_size
+#define __glFogiv_size __gl_param_size
 
-#define __glLightfv_size pname_size
-#define __glLightiv_size pname_size
+#define __glLightfv_size __gl_param_size
+#define __glLightiv_size __gl_param_size
 
-#define __glLightModelfv_size pname_size
+#define __glLightModelfv_size __gl_param_size
 #define __glLightModeliv_size __glLightModelfv_size
 
-#define __glMaterialfv_size pname_size
+#define __glMaterialfv_size __gl_param_size
 #define __glMaterialiv_size __glMaterialfv_size
 
-#define __glTexParameterfv_size pname_size
-#define __glTexParameteriv_size __glTexParameterfv_size
-
-#define __glTexEnvfv_size pname_size
-#define __glTexEnviv_size __glTexEnvfv_size
-
-#define __glTexGendv_size pname_size
-#define __glTexGenfv_size __glTexGendv_size
-#define __glTexGeniv_size __glTexGendv_size
 
 static inline size_t
 __glMap1d_size(GLenum pname)
@@ -246,7 +237,7 @@ __glMap2d_size(GLenum pname)
 
 #define __glMap2f_size __glMap2d_size
 
-#define __glGetBooleanv_size pname_size
+#define __glGetBooleanv_size __gl_param_size
 #define __glGetDoublev_size __glGetBooleanv_size
 #define __glGetFloatv_size __glGetBooleanv_size
 #define __glGetIntegerv_size __glGetBooleanv_size
@@ -258,113 +249,45 @@ __glMap2d_size(GLenum pname)
 #define __glGetMaterialfv_size __glMaterialfv_size
 #define __glGetMaterialiv_size __glMaterialfv_size
 
-#define __glGetTexEnvfv_size __glTexEnvfv_size
-#define __glGetTexEnviv_size __glTexEnvfv_size
 
-#define __glGetTexGendv_size __glTexGendv_size
-#define __glGetTexGenfv_size __glTexGendv_size
-#define __glGetTexGeniv_size __glTexGendv_size
+#define __glColorTableParameterfv_size __gl_param_size
+#define __glColorTableParameteriv_size __gl_param_size
+#define __glGetColorTableParameterfv_size __gl_param_size
+#define __glGetColorTableParameteriv_size __gl_param_size
 
-static inline size_t
-__glGetTexParameterfv_size(GLenum pname)
-{
-    switch (pname) {
-    case GL_TEXTURE_MAG_FILTER:
-    case GL_TEXTURE_MIN_FILTER:
-    case GL_TEXTURE_WRAP_S:
-    case GL_TEXTURE_WRAP_T:
-    case GL_TEXTURE_PRIORITY:
-    case GL_TEXTURE_RESIDENT:
-    case GL_TEXTURE_WRAP_R:
-    case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
-/*  case GL_SHADOW_AMBIENT_SGIX:*/
-    case GL_TEXTURE_MIN_LOD:
-    case GL_TEXTURE_MAX_LOD:
-    case GL_TEXTURE_BASE_LEVEL:
-    case GL_TEXTURE_MAX_LEVEL:
-    case GL_TEXTURE_CLIPMAP_FRAME_SGIX:
-    case GL_TEXTURE_LOD_BIAS_S_SGIX:
-    case GL_TEXTURE_LOD_BIAS_T_SGIX:
-    case GL_TEXTURE_LOD_BIAS_R_SGIX:
-    case GL_GENERATE_MIPMAP:
-/*  case GL_GENERATE_MIPMAP_SGIS:*/
-    case GL_TEXTURE_COMPARE_SGIX:
-    case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
-    case GL_TEXTURE_MAX_CLAMP_S_SGIX:
-    case GL_TEXTURE_MAX_CLAMP_T_SGIX:
-    case GL_TEXTURE_MAX_CLAMP_R_SGIX:
-    case GL_TEXTURE_MAX_ANISOTROPY_EXT:
-    case GL_TEXTURE_LOD_BIAS:
-/*  case GL_TEXTURE_LOD_BIAS_EXT:*/
-    case GL_TEXTURE_RANGE_LENGTH_APPLE:
-    case GL_TEXTURE_STORAGE_HINT_APPLE:
-    case GL_DEPTH_TEXTURE_MODE:
-/*  case GL_DEPTH_TEXTURE_MODE_ARB:*/
-    case GL_TEXTURE_COMPARE_MODE:
-/*  case GL_TEXTURE_COMPARE_MODE_ARB:*/
-    case GL_TEXTURE_COMPARE_FUNC:
-/*  case GL_TEXTURE_COMPARE_FUNC_ARB:*/
-    case GL_TEXTURE_UNSIGNED_REMAP_MODE_NV:
-        return 1;
-    case GL_TEXTURE_CLIPMAP_CENTER_SGIX:
-    case GL_TEXTURE_CLIPMAP_OFFSET_SGIX:
-        return 2;
-    case GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX:
-        return 3;
-    case GL_TEXTURE_BORDER_COLOR:
-    case GL_POST_TEXTURE_FILTER_BIAS_SGIX:
-    case GL_POST_TEXTURE_FILTER_SCALE_SGIX:
-        return 4;
-    default:
-        OS::DebugMessage("warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, pname);
-        return 1;
-    }
-}
-
-#define __glGetTexParameterfv_size pname_size
-#define __glGetTexParameteriv_size __glGetTexParameterfv_size
+#define __glConvolutionParameterfv_size __gl_param_size
+#define __glConvolutionParameteriv_size __gl_param_size
+#define __glGetConvolutionParameterfv_size __gl_param_size
+#define __glGetConvolutionParameteriv_size __gl_param_size
 
-#define __glGetTexLevelParameterfv_size pname_size
-#define __glGetTexLevelParameteriv_size __glGetTexLevelParameterfv_size
+#define __glGetHistogramParameterfv_size __gl_param_size
+#define __glGetHistogramParameteriv_size __gl_param_size
 
-#define __glColorTableParameterfv_size pname_size
-#define __glColorTableParameteriv_size pname_size
-#define __glGetColorTableParameterfv_size pname_size
-#define __glGetColorTableParameteriv_size pname_size
+#define __glGetMinmaxParameterfv_size __gl_param_size
+#define __glGetMinmaxParameteriv_size __gl_param_size
 
-#define __glConvolutionParameterfv_size pname_size
-#define __glConvolutionParameteriv_size pname_size
-#define __glGetConvolutionParameterfv_size pname_size
-#define __glGetConvolutionParameteriv_size pname_size
+#define __glGetProgramivARB_size __gl_param_size
+#define __glGetProgramivNV_size __gl_param_size
 
-#define __glGetHistogramParameterfv_size pname_size
-#define __glGetHistogramParameteriv_size pname_size
+#define __glGetVertexAttribdvARB_size __gl_param_size
+#define __glGetVertexAttribfvARB_size __gl_param_size
+#define __glGetVertexAttribivARB_size __gl_param_size
+#define __glGetVertexAttribdvNV_size __gl_param_size
+#define __glGetVertexAttribfvNV_size __gl_param_size
+#define __glGetVertexAttribivNV_size __gl_param_size
 
-#define __glGetMinmaxParameterfv_size pname_size
-#define __glGetMinmaxParameteriv_size pname_size
-
-#define __glGetProgramivARB_size pname_size
-#define __glGetProgramivNV_size pname_size
-
-#define __glGetVertexAttribdvARB_size pname_size
-#define __glGetVertexAttribfvARB_size pname_size
-#define __glGetVertexAttribivARB_size pname_size
-#define __glGetVertexAttribdvNV_size pname_size
-#define __glGetVertexAttribfvNV_size pname_size
-#define __glGetVertexAttribivNV_size pname_size
-
-#define __glGetQueryObjectivARB_size pname_size
+#define __glGetQueryObjectivARB_size __gl_param_size
 #define __glGetQueryObjectuivARB_size __glGetQueryObjectivARB_size
-#define __glGetQueryivARB_size pname_size
+#define __glGetQueryivARB_size __gl_param_size
 
 #define __glPointParameterfv_size __glPointParameterfvEXT_size
 #define __glPointParameteriv_size __glPointParameterfvEXT_size
 #define __glPointParameterfvARB_size __glPointParameterfvEXT_size
-#define __glPointParameterfvEXT_size pname_size
+#define __glPointParameterfvEXT_size __gl_param_size
 #define __glPointParameterivNV_size __glPointParameterfvEXT_size
 
-#define __glGetFramebufferAttachmentParameteriv_size pname_size
-#define __glGetFramebufferAttachmentParameterivEXT_size pname_size
+#define __glGetFramebufferAttachmentParameteriv_size __gl_param_size
+#define __glGetFramebufferAttachmentParameterivEXT_size __gl_param_size
 
 static inline size_t
 __gl_format_channels(GLenum format) {
@@ -396,7 +319,7 @@ __gl_format_channels(GLenum format) {
 }
 
 static inline size_t
-__glTexImage3D_size(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsizei depth) {
+__gl_image_size(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsizei depth) {
     size_t num_channels = __gl_format_channels(format);
 
     size_t bits_per_pixel;
@@ -461,8 +384,28 @@ __glTexImage3D_size(GLenum format, GLenum type, GLsizei width, GLsizei height, G
     return depth*slice_stride;
 }
 
-#define __glTexImage2D_size(format, type, width, height) __glTexImage3D_size(format, type, width, height, 1)
-#define __glTexImage1D_size(format, type, width)         __glTexImage3D_size(format, type, width, 1, 1)
+#define __glTexParameterfv_size __gl_param_size
+#define __glTexParameteriv_size __gl_param_size
+#define __glGetTexParameterfv_size __gl_param_size
+#define __glGetTexParameteriv_size __gl_param_size
+#define __glGetTexLevelParameterfv_size __gl_param_size
+#define __glGetTexLevelParameteriv_size __gl_param_size
+
+#define __glTexEnvfv_size __gl_param_size
+#define __glTexEnviv_size __gl_param_size
+#define __glGetTexEnvfv_size __gl_param_size
+#define __glGetTexEnviv_size __gl_param_size
+
+#define __glTexGendv_size __gl_param_size
+#define __glTexGenfv_size __gl_param_size
+#define __glTexGeniv_size __gl_param_size
+#define __glGetTexGendv_size __gl_param_size
+#define __glGetTexGenfv_size __gl_param_size
+#define __glGetTexGeniv_size __gl_param_size
+
+#define __glTexImage3D_size(format, type, width, height, depth) __gl_image_size(format, type, width, height, depth)
+#define __glTexImage2D_size(format, type, width, height)        __gl_image_size(format, type, width, height, 1)
+#define __glTexImage1D_size(format, type, width)                __gl_image_size(format, type, width, 1, 1)
 
 #define __glTexSubImage3D_size(format, type, width, height, depth) __glTexImage3D_size(format, type, width, height, depth)
 #define __glTexSubImage2D_size(format, type, width, height)        __glTexImage2D_size(format, type, width, height)
@@ -475,6 +418,20 @@ __glTexImage3D_size(GLenum format, GLenum type, GLsizei width, GLsizei height, G
 #define __glTexSubImage2DEXT_size __glTexSubImage2D_size
 #define __glTexSubImage1DEXT_size __glTexSubImage1D_size
 
+#define __glTextureImage3DEXT_size __glTexImage3D_size
+#define __glTextureImage2DEXT_size __glTexImage2D_size
+#define __glTextureImage1DEXT_size __glTexImage1D_size
+#define __glTextureSubImage3DEXT_size __glTexSubImage3D_size
+#define __glTextureSubImage2DEXT_size __glTexSubImage2D_size
+#define __glTextureSubImage1DEXT_size __glTexSubImage1D_size
+
+#define __glMultiTexImage3DEXT_size __glTexImage3D_size
+#define __glMultiTexImage2DEXT_size __glTexImage2D_size
+#define __glMultiTexImage1DEXT_size __glTexImage1D_size
+#define __glMultiTexSubImage3DEXT_size __glTexSubImage3D_size
+#define __glMultiTexSubImage2DEXT_size __glTexSubImage2D_size
+#define __glMultiTexSubImage1DEXT_size __glTexSubImage1D_size
+
 #define __glDrawPixels_size(format, type, width, height) __glTexImage2D_size(format, type, width, height)
 
 #define __glBitmap_size(width, height) __glTexImage2D_size(GL_COLOR_INDEX, GL_BITMAP, width, height)