X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=glsize.hpp;h=57068e893563d0a12aa64ce0f254e0853a328d22;hb=2f634d57d7dad8943273c55e689171ee8ebce97c;hp=8e1846a96a0ad17f48797ff119906e4e1556330b;hpb=1601c410527dc54ac11018caaa9d330526ca7efe;p=apitrace

diff --git a/glsize.hpp b/glsize.hpp
index 8e1846a..57068e8 100644
--- a/glsize.hpp
+++ b/glsize.hpp
@@ -1,5 +1,6 @@
 /**************************************************************************
  *
+ * Copyright 2011 Jose Fonseca
  * Copyright 2010 VMware, Inc.
  * Copyright 2004 IBM Corporation
  * All Rights Reserved.
@@ -68,6 +69,212 @@ __gl_type_size(GLenum type)
     }
 }
 
+static inline void
+__gl_uniform_size(GLenum type, GLenum &elemType, GLint &numElems) {
+    switch (type) {
+    case GL_FLOAT:
+        elemType = GL_FLOAT;
+        numElems = 1;
+        break;
+    case GL_FLOAT_VEC2:
+        elemType = GL_FLOAT;
+        numElems = 2;
+        break;
+    case GL_FLOAT_VEC3:
+        elemType = GL_FLOAT;
+        numElems = 3;
+        break;
+    case GL_FLOAT_VEC4:
+        elemType = GL_FLOAT;
+        numElems = 4;
+        break;
+    case GL_DOUBLE:
+        elemType = GL_DOUBLE;
+        numElems = 1;
+        break;
+    case GL_DOUBLE_VEC2:
+        elemType = GL_DOUBLE;
+        numElems = 2;
+        break;
+    case GL_DOUBLE_VEC3:
+        elemType = GL_DOUBLE;
+        numElems = 3;
+        break;
+    case GL_DOUBLE_VEC4:
+        elemType = GL_DOUBLE;
+        numElems = 4;
+        break;
+    case GL_INT:
+        elemType = GL_INT;
+        numElems = 1;
+        break;
+    case GL_INT_VEC2:
+        elemType = GL_INT;
+        numElems = 2;
+        break;
+    case GL_INT_VEC3:
+        elemType = GL_INT;
+        numElems = 3;
+        break;
+    case GL_INT_VEC4:
+        elemType = GL_INT;
+        numElems = 4;
+        break;
+    case GL_UNSIGNED_INT:
+        elemType = GL_UNSIGNED_INT;
+        numElems = 1;
+        break;
+    case GL_UNSIGNED_INT_VEC2:
+        elemType = GL_UNSIGNED_INT;
+        numElems = 2;
+        break;
+    case GL_UNSIGNED_INT_VEC3:
+        elemType = GL_UNSIGNED_INT;
+        numElems = 3;
+        break;
+    case GL_UNSIGNED_INT_VEC4:
+        elemType = GL_UNSIGNED_INT;
+        numElems = 4;
+        break;
+    case GL_BOOL:
+        elemType = GL_BOOL;
+        numElems = 1;
+        break;
+    case GL_BOOL_VEC2:
+        elemType = GL_BOOL;
+        numElems = 2;
+        break;
+    case GL_BOOL_VEC3:
+        elemType = GL_BOOL;
+        numElems = 3;
+        break;
+    case GL_BOOL_VEC4:
+        elemType = GL_BOOL;
+        numElems = 4;
+        break;
+    case GL_FLOAT_MAT2:
+        elemType = GL_FLOAT;
+        numElems = 2*2;
+        break;
+    case GL_FLOAT_MAT3:
+        elemType = GL_FLOAT;
+        numElems = 3*3;
+        break;
+    case GL_FLOAT_MAT4:
+        elemType = GL_FLOAT;
+        numElems = 4*4;
+        break;
+    case GL_FLOAT_MAT2x3:
+        elemType = GL_FLOAT;
+        numElems = 2*3;
+        break;
+    case GL_FLOAT_MAT2x4:
+        elemType = GL_FLOAT;
+        numElems = 2*4;
+        break;
+    case GL_FLOAT_MAT3x2:
+        elemType = GL_FLOAT;
+        numElems = 3*2;
+        break;
+    case GL_FLOAT_MAT3x4:
+        elemType = GL_FLOAT;
+        numElems = 3*4;
+        break;
+    case GL_FLOAT_MAT4x2:
+        elemType = GL_FLOAT;
+        numElems = 4*2;
+        break;
+    case GL_FLOAT_MAT4x3:
+        elemType = GL_FLOAT;
+        numElems = 4*3;
+        break;
+    case GL_DOUBLE_MAT2:
+        elemType = GL_DOUBLE;
+        numElems = 2*2;
+        break;
+    case GL_DOUBLE_MAT3:
+        elemType = GL_DOUBLE;
+        numElems = 3*3;
+        break;
+    case GL_DOUBLE_MAT4:
+        elemType = GL_DOUBLE;
+        numElems = 4*4;
+        break;
+    case GL_DOUBLE_MAT2x3:
+        elemType = GL_DOUBLE;
+        numElems = 2*3;
+        break;
+    case GL_DOUBLE_MAT2x4:
+        elemType = GL_DOUBLE;
+        numElems = 2*4;
+        break;
+    case GL_DOUBLE_MAT3x2:
+        elemType = GL_DOUBLE;
+        numElems = 3*2;
+        break;
+    case GL_DOUBLE_MAT3x4:
+        elemType = GL_DOUBLE;
+        numElems = 3*4;
+        break;
+    case GL_DOUBLE_MAT4x2:
+        elemType = GL_DOUBLE;
+        numElems = 4*2;
+        break;
+    case GL_DOUBLE_MAT4x3:
+        elemType = GL_DOUBLE;
+        numElems = 4*3;
+        break;
+    case GL_SAMPLER_1D:
+    case GL_SAMPLER_2D:
+    case GL_SAMPLER_3D:
+    case GL_SAMPLER_CUBE:
+    case GL_SAMPLER_1D_SHADOW:
+    case GL_SAMPLER_2D_SHADOW:
+    case GL_SAMPLER_1D_ARRAY:
+    case GL_SAMPLER_2D_ARRAY:
+    case GL_SAMPLER_CUBE_MAP_ARRAY:
+    case GL_SAMPLER_1D_ARRAY_SHADOW:
+    case GL_SAMPLER_2D_ARRAY_SHADOW:
+    case GL_SAMPLER_2D_MULTISAMPLE:
+    case GL_SAMPLER_2D_MULTISAMPLE_ARRAY:
+    case GL_SAMPLER_CUBE_SHADOW:
+    case GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW:
+    case GL_SAMPLER_BUFFER:
+    case GL_SAMPLER_2D_RECT:
+    case GL_SAMPLER_2D_RECT_SHADOW:
+    case GL_INT_SAMPLER_1D:
+    case GL_INT_SAMPLER_2D:
+    case GL_INT_SAMPLER_3D:
+    case GL_INT_SAMPLER_CUBE:
+    case GL_INT_SAMPLER_1D_ARRAY:
+    case GL_INT_SAMPLER_2D_ARRAY:
+    case GL_INT_SAMPLER_CUBE_MAP_ARRAY:
+    case GL_INT_SAMPLER_2D_MULTISAMPLE:
+    case GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY:
+    case GL_INT_SAMPLER_BUFFER:
+    case GL_INT_SAMPLER_2D_RECT:
+    case GL_UNSIGNED_INT_SAMPLER_1D:
+    case GL_UNSIGNED_INT_SAMPLER_2D:
+    case GL_UNSIGNED_INT_SAMPLER_3D:
+    case GL_UNSIGNED_INT_SAMPLER_CUBE:
+    case GL_UNSIGNED_INT_SAMPLER_1D_ARRAY:
+    case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY:
+    case GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY:
+    case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE:
+    case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY:
+    case GL_UNSIGNED_INT_SAMPLER_BUFFER:
+    case GL_UNSIGNED_INT_SAMPLER_2D_RECT:
+        elemType = GL_INT;
+        numElems = 1;
+        break;
+    default:
+        OS::DebugMessage("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, type);
+        elemType = GL_NONE;
+        numElems = 0;
+        return;
+    }
+}
+    
 static inline size_t
 __glArrayPointer_size(GLint size, GLenum type, GLsizei stride, GLsizei maxIndex)
 {
@@ -110,6 +317,7 @@ __glDrawElementsBaseVertex_maxindex(GLsizei count, GLenum type, const GLvoid *in
     if (!count) {
         return 0;
     }
+
     __glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING, &__element_array_buffer);
     if (__element_array_buffer) {
         // Read indices from index buffer object
@@ -170,12 +378,17 @@ __glDrawElementsBaseVertex_maxindex(GLsizei count, GLenum type, const GLvoid *in
 #define __glDrawRangeElements_maxindex(start, end, count, type, indices) __glDrawElements_maxindex(count, type, indices)
 #define __glDrawRangeElementsEXT_maxindex __glDrawRangeElements_maxindex
 
+/* FIXME take in consideration instancing */
 #define __glDrawArraysInstanced_maxindex(first, count, primcount) __glDrawArrays_maxindex(first, count)
 #define __glDrawElementsInstanced_maxindex(count, type, indices, primcount) __glDrawElements_maxindex(count, type, indices)
 #define __glDrawElementsInstancedBaseVertex_maxindex(count, type, indices, primcount, basevertex) __glDrawElementsBaseVertex_maxindex(count, type, indices, basevertex)
 #define __glDrawRangeElementsInstanced_maxindex(start, end, count, type, indices, primcount) __glDrawRangeElements_maxindex(start, end, count, type, indices)
 #define __glDrawRangeElementsInstancedBaseVertex_maxindex(start, end, count, type, indices, primcount, basevertex) __glDrawRangeElementsBaseVertex_maxindex(start, end, count, type, indices, basevertex)
 
+#define __glDrawArraysInstancedBaseInstance_maxindex(first, count, primcount, baseinstance) __glDrawArrays_maxindex(first, count)
+#define __glDrawElementsInstancedBaseInstance_maxindex(count, type, indices, primcount, baseinstance) __glDrawElements_maxindex(count, type, indices)
+#define __glDrawElementsInstancedBaseVertexBaseInstance_maxindex(count, type, indices, primcount, basevertex, baseinstance) __glDrawElementsBaseVertex_maxindex(count, type, indices, basevertex)
+
 #define __glDrawArraysInstancedARB_maxindex __glDrawArraysInstanced_maxindex
 #define __glDrawElementsInstancedARB_maxindex __glDrawElementsInstanced_maxindex
 #define __glDrawArraysInstancedEXT_maxindex __glDrawArraysInstanced_maxindex
@@ -236,19 +449,6 @@ __glCallLists_size(GLsizei n, GLenum type)
     return n*__gl_type_size(type);
 }
 
-#define __glFogfv_size __gl_param_size
-#define __glFogiv_size __gl_param_size
-
-#define __glLightfv_size __gl_param_size
-#define __glLightiv_size __gl_param_size
-
-#define __glLightModelfv_size __gl_param_size
-#define __glLightModeliv_size __glLightModelfv_size
-
-#define __glMaterialfv_size __gl_param_size
-#define __glMaterialiv_size __glMaterialfv_size
-
-
 static inline size_t
 __glMap1d_size(GLenum target, GLint stride, GLint order)
 {
@@ -331,64 +531,7 @@ __glMap2d_size(GLenum target, GLint ustride, GLint uorder, GLint vstride, GLint
 
 #define __glMap2f_size __glMap2d_size
 
-#define __glGetBooleanv_size __gl_param_size
-#define __glGetDoublev_size __glGetBooleanv_size
-#define __glGetFloatv_size __glGetBooleanv_size
-#define __glGetIntegerv_size __glGetBooleanv_size
-#define __glGetInteger64v_size __glGetBooleanv_size
-#define __glGetBooleani_v_size __gl_param_size
-#define __glGetDoublei_v_size __glGetBooleanv_size
-#define __glGetFloati_v_size __glGetBooleanv_size
-#define __glGetIntegeri_v_size __glGetBooleani_v_size
-#define __glGetInteger64i_v_size __glGetBooleani_v_size
-
-#define __glGetLightfv_size __glLightfv_size
-#define __glGetLightiv_size __glLightfv_size
-
-#define __glGetMaterialfv_size __glMaterialfv_size
-#define __glGetMaterialiv_size __glMaterialfv_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
-
-#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 __glGetHistogramParameterfv_size __gl_param_size
-#define __glGetHistogramParameteriv_size __gl_param_size
-
-#define __glGetMinmaxParameterfv_size __gl_param_size
-#define __glGetMinmaxParameteriv_size __gl_param_size
-
-#define __glGetProgramivARB_size __gl_param_size
-#define __glGetProgramivNV_size __gl_param_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 __glGetQueryObjectivARB_size __gl_param_size
-#define __glGetQueryObjectuivARB_size __glGetQueryObjectivARB_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 __gl_param_size
-#define __glPointParameterivNV_size __glPointParameterfvEXT_size
-
-#define __glGetFramebufferAttachmentParameteriv_size __gl_param_size
-#define __glGetFramebufferAttachmentParameterivEXT_size __gl_param_size
-
-static inline size_t
+static inline unsigned
 __gl_format_channels(GLenum format) {
     switch (format) {
     case GL_COLOR_INDEX:
@@ -404,14 +547,18 @@ __gl_format_channels(GLenum format) {
     case GL_DEPTH_STENCIL:
     case GL_LUMINANCE_ALPHA:
     case GL_RG:
+    case GL_HILO_NV:
+    case GL_DSDT_NV:
         return 2;
     case GL_RGB:
     case GL_BGR:
+    case GL_DSDT_MAG_NV:
         return 3;
     case GL_RGBA:
     case GL_BGRA:
     case GL_ABGR_EXT:
     case GL_CMYK_EXT:
+    case GL_DSDT_MAG_VIB_NV:
         return 4;
     case GL_CMYKA_EXT:
         return 5;
@@ -435,9 +582,9 @@ _align(X x, Y y) {
 
 static inline size_t
 __gl_image_size(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsizei depth) {
-    size_t num_channels = __gl_format_channels(format);
+    unsigned num_channels = __gl_format_channels(format);
 
-    size_t bits_per_pixel;
+    unsigned bits_per_pixel;
     switch (type) {
     case GL_BITMAP:
         bits_per_pixel = 1;
@@ -510,7 +657,7 @@ __gl_image_size(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsiz
 
     size_t row_stride = (row_length*bits_per_pixel + 7)/8;
 
-    if (bits_per_pixel < alignment*8 &&
+    if ((GLint)bits_per_pixel < alignment*8 &&
         (bits_per_pixel & 7) == 0 &&
         _is_pot(bits_per_pixel)) {
         row_stride = _align(row_stride, alignment);
@@ -534,29 +681,6 @@ __gl_image_size(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsiz
     return size;
 }
 
-#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 __glTexParameterIiv_size __gl_param_size
-#define __glTexParameterIuiv_size __gl_param_size
-#define __glGetTexParameterIiv_size __gl_param_size
-#define __glGetTexParameterIuiv_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)