X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glsize.hpp;h=257d59913e46d0b5f4b7c8cd9e69eec3792f7594;hb=0f0a598677d6d1c97be830c5fa20d6187480aa52;hp=3941f78d099bf6aa60ce5f4206fe1328740a8d71;hpb=b1545e83ddea8cca49b2408ae34c61eec4dcf74d;p=apitrace diff --git a/glsize.hpp b/glsize.hpp index 3941f78..257d599 100644 --- a/glsize.hpp +++ b/glsize.hpp @@ -34,6 +34,8 @@ #define _GL_SIZE_HPP_ +#include + #include "os.hpp" #include "glimports.hpp" @@ -61,11 +63,217 @@ __gl_type_size(GLenum type) case GL_DOUBLE: return 8; default: - OS::DebugMessage("warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, type); + OS::DebugMessage("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, type); return 0; } } +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) { @@ -85,6 +293,8 @@ __glArrayPointer_size(GLint size, GLenum type, GLsizei stride, GLsizei maxIndex) #define __glFogCoordPointer_size(type, stride, maxIndex) __glArrayPointer_size(1, type, stride, maxIndex) #define __glSecondaryColorPointer_size(size, type, stride, maxIndex) __glArrayPointer_size(size, type, stride, maxIndex) #define __glVertexAttribPointer_size(size, type, normalized, stride, maxIndex) __glArrayPointer_size(size, type, stride, maxIndex) +#define __glVertexAttribPointerARB_size(size, type, normalized, stride, maxIndex) __glArrayPointer_size(size, type, stride, maxIndex) +#define __glVertexAttribPointerNV_size(size, type, stride, maxIndex) __glArrayPointer_size(size, type, stride, maxIndex) static inline GLuint __glDrawArrays_maxindex(GLint first, GLsizei count) @@ -98,7 +308,7 @@ __glDrawArrays_maxindex(GLint first, GLsizei count) #define __glDrawArraysEXT_maxindex __glDrawArrays_maxindex static inline GLuint -__glDrawElements_maxindex(GLsizei count, GLenum type, const GLvoid *indices) +__glDrawElementsBaseVertex_maxindex(GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex) { GLvoid *temp = 0; GLint __element_array_buffer = 0; @@ -148,25 +358,83 @@ __glDrawElements_maxindex(GLsizei count, GLenum type, const GLvoid *indices) } } } else { - OS::DebugMessage("warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, type); + OS::DebugMessage("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, type); } if (__element_array_buffer) { free(temp); } + maxindex += basevertex; + return maxindex; } +#define __glDrawRangeElementsBaseVertex_maxindex(start, end, count, type, indices, basevertex) __glDrawElementsBaseVertex_maxindex(count, type, indices, basevertex) + +#define __glDrawElements_maxindex(count, type, indices) __glDrawElementsBaseVertex_maxindex(count, type, indices, 0); +#define __glDrawRangeElements_maxindex(start, end, count, type, indices) __glDrawElements_maxindex(count, type, indices) +#define __glDrawRangeElementsEXT_maxindex __glDrawRangeElements_maxindex + +#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 __glDrawArraysInstancedARB_maxindex __glDrawArraysInstanced_maxindex +#define __glDrawElementsInstancedARB_maxindex __glDrawElementsInstanced_maxindex +#define __glDrawArraysInstancedEXT_maxindex __glDrawArraysInstanced_maxindex +#define __glDrawElementsInstancedEXT_maxindex __glDrawElementsInstanced_maxindex + static inline GLuint -__glDrawRangeElements_maxindex(GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid * indices) -{ - (void)start; - (void)end; - return __glDrawElements_maxindex(count, type, indices); +__glDrawArraysIndirect_maxindex(const GLvoid *indirect) { + OS::DebugMessage("apitrace: warning: %s: unsupported\n", __FUNCTION__); + return 0; } -#define __glDrawRangeElementsEXT_maxindex __glDrawRangeElements_maxindex +static inline GLuint +__glDrawElementsIndirect_maxindex(GLenum type, const GLvoid *indirect) { + OS::DebugMessage("apitrace: warning: %s: unsupported\n", __FUNCTION__); + return 0; +} + +static inline GLuint +__glMultiDrawArrays_maxindex(const GLint *first, const GLsizei *count, GLsizei primcount) { + GLuint maxindex = 0; + for (GLsizei prim = 0; prim < primcount; ++prim) { + GLuint maxindex_prim = __glDrawArrays_maxindex(first[prim], count[prim]); + maxindex = std::max(maxindex, maxindex_prim); + } + return maxindex; +} + +static inline GLuint +__glMultiDrawElements_maxindex(const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount) { + GLuint maxindex = 0; + for (GLsizei prim = 0; prim < primcount; ++prim) { + GLuint maxindex_prim = __glDrawElements_maxindex(count[prim], type, indices[prim]); + maxindex = std::max(maxindex, maxindex_prim); + } + return maxindex; +} + +static inline GLuint +__glMultiDrawElementsBaseVertex_maxindex(const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, const GLint * basevertex) { + GLuint maxindex = 0; + for (GLsizei prim = 0; prim < primcount; ++prim) { + GLuint maxindex_prim = __glDrawElementsBaseVertex_maxindex(count[prim], type, indices[prim], basevertex[prim]); + maxindex = std::max(maxindex, maxindex_prim); + } + return maxindex; +} + +#define __glMultiDrawArraysEXT_maxindex __glMultiDrawArrays_maxindex +#define __glMultiDrawElementsEXT_maxindex __glMultiDrawElements_maxindex + +#define __glMultiModeDrawArraysIBM_maxindex(first, count, primcount, modestride) __glMultiDrawArrays_maxindex(first, count, primcount) +#define __glMultiModeDrawElementsIBM_maxindex(count, type, indices, primcount, modestride) __glMultiDrawElements_maxindex(count, type, (const GLvoid **)indices, primcount) + static inline size_t __glCallLists_size(GLsizei n, GLenum type) @@ -174,83 +442,111 @@ __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) +__glMap1d_size(GLenum target, GLint stride, GLint order) { - switch (pname) { + if (order < 1) { + return 0; + } + + GLint channels; + switch (target) { case GL_MAP1_INDEX: case GL_MAP1_TEXTURE_COORD_1: - return 1; + channels = 1; + break; case GL_MAP1_TEXTURE_COORD_2: - return 2; + channels = 2; + break; case GL_MAP1_NORMAL: case GL_MAP1_TEXTURE_COORD_3: case GL_MAP1_VERTEX_3: - return 3; + channels = 3; + break; case GL_MAP1_COLOR_4: case GL_MAP1_TEXTURE_COORD_4: case GL_MAP1_VERTEX_4: - return 4; + channels = 4; + break; default: - OS::DebugMessage("warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, pname); - return 1; + OS::DebugMessage("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, target); + return 0; + } + + if (stride < channels) { + return 0; } + + return channels + stride * (order - 1); } #define __glMap1f_size __glMap1d_size static inline size_t -__glMap2d_size(GLenum pname) +__glMap2d_size(GLenum target, GLint ustride, GLint uorder, GLint vstride, GLint vorder) { - switch (pname) { + if (uorder < 1 || vorder < 1) { + return 0; + } + + GLint channels; + switch (target) { case GL_MAP2_INDEX: case GL_MAP2_TEXTURE_COORD_1: - return 1; + channels = 1; + break; case GL_MAP2_TEXTURE_COORD_2: - return 2; + channels = 2; + break; case GL_MAP2_NORMAL: case GL_MAP2_TEXTURE_COORD_3: case GL_MAP2_VERTEX_3: - return 3; + channels = 3; + break; case GL_MAP2_COLOR_4: case GL_MAP2_TEXTURE_COORD_4: case GL_MAP2_VERTEX_4: - return 4; + channels = 4; + break; default: - OS::DebugMessage("warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, pname); - return 1; + OS::DebugMessage("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, target); + return 0; + } + + if (ustride < channels || vstride < channels) { + return 0; } + + return channels + + ustride * (uorder - 1) + + vstride * (vorder - 1); } #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 #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 @@ -258,113 +554,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 __glGetTexLevelParameterfv_size pname_size -#define __glGetTexLevelParameteriv_size __glGetTexLevelParameterfv_size - -#define __glColorTableParameterfv_size pname_size -#define __glColorTableParameteriv_size pname_size -#define __glGetColorTableParameterfv_size pname_size -#define __glGetColorTableParameteriv_size pname_size - -#define __glConvolutionParameterfv_size pname_size -#define __glConvolutionParameteriv_size pname_size -#define __glGetConvolutionParameterfv_size pname_size -#define __glGetConvolutionParameteriv_size pname_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 pname_size -#define __glGetHistogramParameteriv_size pname_size +#define __glGetHistogramParameterfv_size __gl_param_size +#define __glGetHistogramParameteriv_size __gl_param_size -#define __glGetMinmaxParameterfv_size pname_size -#define __glGetMinmaxParameteriv_size pname_size +#define __glGetMinmaxParameterfv_size __gl_param_size +#define __glGetMinmaxParameteriv_size __gl_param_size -#define __glGetProgramivARB_size pname_size -#define __glGetProgramivNV_size pname_size +#define __glGetProgramivARB_size __gl_param_size +#define __glGetProgramivNV_size __gl_param_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 __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 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) { @@ -382,21 +610,41 @@ __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; default: - OS::DebugMessage("warning: %s: unexpected format GLenum 0x%04X\n", __FUNCTION__, format); + OS::DebugMessage("apitrace: warning: %s: unexpected format GLenum 0x%04X\n", __FUNCTION__, format); return 0; } } +template +static inline bool +_is_pot(X x) { + return (x & (x - 1)) == 0; +} + +template +static inline X +_align(X x, Y y) { + return (x + (y - 1)) & ~(y - 1); +} + 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; @@ -447,22 +695,81 @@ __glTexImage3D_size(GLenum format, GLenum type, GLsizei width, GLsizei height, G bits_per_pixel = 64; break; default: - OS::DebugMessage("warning: %s: unexpected type GLenum 0x%04X\n", __FUNCTION__, type); + OS::DebugMessage("apitrace: warning: %s: unexpected type GLenum 0x%04X\n", __FUNCTION__, type); bits_per_pixel = 0; break; } - /* FIXME: consider glPixelStore settings */ + GLint alignment = 4; + GLint row_length = 0; + GLint image_height = 0; + GLint skip_rows = 0; + GLint skip_pixels = 0; + GLint skip_images = 0; + + __glGetIntegerv(GL_UNPACK_ALIGNMENT, &alignment); + __glGetIntegerv(GL_UNPACK_ROW_LENGTH, &row_length); + __glGetIntegerv(GL_UNPACK_IMAGE_HEIGHT, &image_height); + __glGetIntegerv(GL_UNPACK_SKIP_ROWS, &skip_rows); + __glGetIntegerv(GL_UNPACK_SKIP_PIXELS, &skip_pixels); + __glGetIntegerv(GL_UNPACK_SKIP_IMAGES, &skip_images); + + if (row_length <= 0) { + row_length = width; + } + + size_t row_stride = (row_length*bits_per_pixel + 7)/8; + + if (bits_per_pixel < alignment*8 && + (bits_per_pixel & 7) == 0 && + _is_pot(bits_per_pixel)) { + row_stride = _align(row_stride, alignment); + } + + if (image_height <= 0) { + image_height = height; + } + + /* XXX: GL_UNPACK_IMAGE_HEIGHT and GL_UNPACK_SKIP_IMAGES should probably + * not be considered for pixel rectangles. */ + + size_t image_stride = image_height*row_stride; - size_t row_stride = (width*bits_per_pixel + 7)/8; + size_t size = depth*image_stride; - size_t slice_stride = height*row_stride; + size += (skip_pixels*bits_per_pixel + 7)/8; + size += skip_rows*row_stride; + size += skip_images*image_stride; - return depth*slice_stride; + return size; } -#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 __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) #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,11 +782,48 @@ __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 __glConvolutionFilter1D_size(format, type, width) __glTexImage1D_size(format, type, width) +#define __glConvolutionFilter2D_size(format, type, width, height) __glTexImage2D_size(format, type, width, height) +#define __glColorTable_size(format, type, width) __glTexImage1D_size(format, type, width) +#define __glColorSubTable_size(format, type, count) __glColorTable_size(format, type, count) #define __glBitmap_size(width, height) __glTexImage2D_size(GL_COLOR_INDEX, GL_BITMAP, width, height) #define __glPolygonStipple_size() __glBitmap_size(32, 32) +static inline size_t +__glClearBuffer_size(GLenum buffer) +{ + switch (buffer) { + case GL_COLOR: + case GL_FRONT: + case GL_BACK: + case GL_LEFT: + case GL_RIGHT: + case GL_FRONT_AND_BACK: + return 4; + case GL_DEPTH: + case GL_STENCIL: + return 1; + default: + OS::DebugMessage("apitrace: warning: %s: unexpected buffer GLenum 0x%04X\n", __FUNCTION__, buffer); + return 0; + } +} /* * 0 terminated integer/float attribute list.