X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=helpers%2Fglsize.hpp;h=a5891997b9600d718380e0056c58a9269aad27db;hb=d0ff69f61b95779363539aa61a1ec82258d23d3b;hp=916d9799f9a02626c4067a19047f7c0a86917c87;hpb=632a78d5c90941c896fa3c7156131f27c5a58b24;p=apitrace diff --git a/helpers/glsize.hpp b/helpers/glsize.hpp index 916d979..a589199 100644 --- a/helpers/glsize.hpp +++ b/helpers/glsize.hpp @@ -37,6 +37,8 @@ #include +#include + #include "os.hpp" #include "glimports.hpp" @@ -71,159 +73,175 @@ _gl_type_size(GLenum type) } static inline void -_gl_uniform_size(GLenum type, GLenum &elemType, GLint &numElems) { +_gl_uniform_size(GLenum type, GLenum &elemType, GLint &numCols, GLint &numRows) { + numCols = 1; + numRows = 1; + switch (type) { case GL_FLOAT: elemType = GL_FLOAT; - numElems = 1; break; case GL_FLOAT_VEC2: elemType = GL_FLOAT; - numElems = 2; + numCols = 2; break; case GL_FLOAT_VEC3: elemType = GL_FLOAT; - numElems = 3; + numCols = 3; break; case GL_FLOAT_VEC4: elemType = GL_FLOAT; - numElems = 4; + numCols = 4; break; case GL_DOUBLE: elemType = GL_DOUBLE; - numElems = 1; break; case GL_DOUBLE_VEC2: elemType = GL_DOUBLE; - numElems = 2; + numCols = 2; break; case GL_DOUBLE_VEC3: elemType = GL_DOUBLE; - numElems = 3; + numCols = 3; break; case GL_DOUBLE_VEC4: elemType = GL_DOUBLE; - numElems = 4; + numCols = 4; break; case GL_INT: elemType = GL_INT; - numElems = 1; break; case GL_INT_VEC2: elemType = GL_INT; - numElems = 2; + numCols = 2; break; case GL_INT_VEC3: elemType = GL_INT; - numElems = 3; + numCols = 3; break; case GL_INT_VEC4: elemType = GL_INT; - numElems = 4; + numCols = 4; break; case GL_UNSIGNED_INT: elemType = GL_UNSIGNED_INT; - numElems = 1; break; case GL_UNSIGNED_INT_VEC2: elemType = GL_UNSIGNED_INT; - numElems = 2; + numCols = 2; break; case GL_UNSIGNED_INT_VEC3: elemType = GL_UNSIGNED_INT; - numElems = 3; + numCols = 3; break; case GL_UNSIGNED_INT_VEC4: elemType = GL_UNSIGNED_INT; - numElems = 4; + numCols = 4; break; case GL_BOOL: elemType = GL_BOOL; - numElems = 1; break; case GL_BOOL_VEC2: elemType = GL_BOOL; - numElems = 2; + numCols = 2; break; case GL_BOOL_VEC3: elemType = GL_BOOL; - numElems = 3; + numCols = 3; break; case GL_BOOL_VEC4: elemType = GL_BOOL; - numElems = 4; + numCols = 4; break; case GL_FLOAT_MAT2: elemType = GL_FLOAT; - numElems = 2*2; + numCols = 2; + numRows = 2; break; case GL_FLOAT_MAT3: elemType = GL_FLOAT; - numElems = 3*3; + numCols = 3; + numRows = 3; break; case GL_FLOAT_MAT4: elemType = GL_FLOAT; - numElems = 4*4; + numCols = 4; + numRows = 4; break; case GL_FLOAT_MAT2x3: elemType = GL_FLOAT; - numElems = 2*3; + numCols = 2; + numRows = 3; break; case GL_FLOAT_MAT2x4: elemType = GL_FLOAT; - numElems = 2*4; + numCols = 2; + numRows = 4; break; case GL_FLOAT_MAT3x2: elemType = GL_FLOAT; - numElems = 3*2; + numCols = 3; + numRows = 2; break; case GL_FLOAT_MAT3x4: elemType = GL_FLOAT; - numElems = 3*4; + numCols = 3; + numRows = 4; break; case GL_FLOAT_MAT4x2: elemType = GL_FLOAT; - numElems = 4*2; + numCols = 4; + numRows = 2; break; case GL_FLOAT_MAT4x3: elemType = GL_FLOAT; - numElems = 4*3; + numCols = 4; + numRows = 3; break; case GL_DOUBLE_MAT2: elemType = GL_DOUBLE; - numElems = 2*2; + numCols = 2; + numRows = 2; break; case GL_DOUBLE_MAT3: elemType = GL_DOUBLE; - numElems = 3*3; + numCols = 3; + numRows = 3; break; case GL_DOUBLE_MAT4: elemType = GL_DOUBLE; - numElems = 4*4; + numCols = 4; + numRows = 4; break; case GL_DOUBLE_MAT2x3: elemType = GL_DOUBLE; - numElems = 2*3; + numCols = 2; + numRows = 3; break; case GL_DOUBLE_MAT2x4: elemType = GL_DOUBLE; - numElems = 2*4; + numCols = 2; + numRows = 4; break; case GL_DOUBLE_MAT3x2: elemType = GL_DOUBLE; - numElems = 3*2; + numCols = 3; + numRows = 2; break; case GL_DOUBLE_MAT3x4: elemType = GL_DOUBLE; - numElems = 3*4; + numCols = 3; + numRows = 4; break; case GL_DOUBLE_MAT4x2: elemType = GL_DOUBLE; - numElems = 4*2; + numCols = 4; + numRows = 2; break; case GL_DOUBLE_MAT4x3: elemType = GL_DOUBLE; - numElems = 4*3; + numCols = 4; + numRows = 3; break; case GL_SAMPLER_1D: case GL_SAMPLER_2D: @@ -266,51 +284,56 @@ _gl_uniform_size(GLenum type, GLenum &elemType, GLint &numElems) { case GL_UNSIGNED_INT_SAMPLER_BUFFER: case GL_UNSIGNED_INT_SAMPLER_2D_RECT: elemType = GL_INT; - numElems = 1; break; default: os::log("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, type); elemType = GL_NONE; - numElems = 0; + numCols = 0; + numRows = 0; return; } } static inline size_t -_glArrayPointer_size(GLint size, GLenum type, GLsizei stride, GLsizei maxIndex) +_glArrayPointer_size(GLint size, GLenum type, GLsizei stride, GLsizei count) { + if (!count) { + return 0; + } + size_t elementSize = size*_gl_type_size(type); if (!stride) { stride = (GLsizei)elementSize; } - return stride*maxIndex + elementSize; + + return stride*(count - 1) + elementSize; } -#define _glVertexPointer_size(size, type, stride, maxIndex) _glArrayPointer_size(size, type, stride, maxIndex) -#define _glNormalPointer_size(type, stride, maxIndex) _glArrayPointer_size(3, type, stride, maxIndex) -#define _glColorPointer_size(size, type, stride, maxIndex) _glArrayPointer_size(size, type, stride, maxIndex) -#define _glIndexPointer_size(type, stride, maxIndex) _glArrayPointer_size(1, type, stride, maxIndex) -#define _glTexCoordPointer_size(size, type, stride, maxIndex) _glArrayPointer_size(size, type, stride, maxIndex) -#define _glEdgeFlagPointer_size(stride, maxIndex) _glArrayPointer_size(1, GL_BOOL, stride, 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) +#define _glVertexPointer_size(size, type, stride, count) _glArrayPointer_size(size, type, stride, count) +#define _glNormalPointer_size(type, stride, count) _glArrayPointer_size(3, type, stride, count) +#define _glColorPointer_size(size, type, stride, count) _glArrayPointer_size(size, type, stride, count) +#define _glIndexPointer_size(type, stride, count) _glArrayPointer_size(1, type, stride, count) +#define _glTexCoordPointer_size(size, type, stride, count) _glArrayPointer_size(size, type, stride, count) +#define _glEdgeFlagPointer_size(stride, count) _glArrayPointer_size(1, GL_BOOL, stride, count) +#define _glFogCoordPointer_size(type, stride, count) _glArrayPointer_size(1, type, stride, count) +#define _glSecondaryColorPointer_size(size, type, stride, count) _glArrayPointer_size(size, type, stride, count) +#define _glVertexAttribPointer_size(size, type, normalized, stride, count) _glArrayPointer_size(size, type, stride, count) +#define _glVertexAttribPointerARB_size(size, type, normalized, stride, count) _glArrayPointer_size(size, type, stride, count) +#define _glVertexAttribPointerNV_size(size, type, stride, count) _glArrayPointer_size(size, type, stride, count) static inline GLuint -_glDrawArrays_maxindex(GLint first, GLsizei count) +_glDrawArrays_count(GLint first, GLsizei count) { if (!count) { return 0; } - return first + count - 1; + return first + count; } -#define _glDrawArraysEXT_maxindex _glDrawArrays_maxindex +#define _glDrawArraysEXT_count _glDrawArrays_count static inline GLuint -_glDrawElementsBaseVertex_maxindex(GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex) +_glDrawElementsBaseVertex_count(GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex) { GLvoid *temp = 0; GLint element_array_buffer = 0; @@ -370,78 +393,78 @@ _glDrawElementsBaseVertex_maxindex(GLsizei count, GLenum type, const GLvoid *ind maxindex += basevertex; - return maxindex; + return maxindex + 1; } -#define _glDrawRangeElementsBaseVertex_maxindex(start, end, count, type, indices, basevertex) _glDrawElementsBaseVertex_maxindex(count, type, indices, basevertex) +#define _glDrawRangeElementsBaseVertex_count(start, end, count, type, indices, basevertex) _glDrawElementsBaseVertex_count(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 _glDrawElements_count(count, type, indices) _glDrawElementsBaseVertex_count(count, type, indices, 0); +#define _glDrawRangeElements_count(start, end, count, type, indices) _glDrawElements_count(count, type, indices) +#define _glDrawRangeElementsEXT_count _glDrawRangeElements_count /* 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 _glDrawArraysInstanced_count(first, count, primcount) _glDrawArrays_count(first, count) +#define _glDrawElementsInstanced_count(count, type, indices, primcount) _glDrawElements_count(count, type, indices) +#define _glDrawElementsInstancedBaseVertex_count(count, type, indices, primcount, basevertex) _glDrawElementsBaseVertex_count(count, type, indices, basevertex) +#define _glDrawRangeElementsInstanced_count(start, end, count, type, indices, primcount) _glDrawRangeElements_count(start, end, count, type, indices) +#define _glDrawRangeElementsInstancedBaseVertex_count(start, end, count, type, indices, primcount, basevertex) _glDrawRangeElementsBaseVertex_count(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 _glDrawArraysInstancedBaseInstance_count(first, count, primcount, baseinstance) _glDrawArrays_count(first, count) +#define _glDrawElementsInstancedBaseInstance_count(count, type, indices, primcount, baseinstance) _glDrawElements_count(count, type, indices) +#define _glDrawElementsInstancedBaseVertexBaseInstance_count(count, type, indices, primcount, basevertex, baseinstance) _glDrawElementsBaseVertex_count(count, type, indices, basevertex) -#define _glDrawArraysInstancedARB_maxindex _glDrawArraysInstanced_maxindex -#define _glDrawElementsInstancedARB_maxindex _glDrawElementsInstanced_maxindex -#define _glDrawArraysInstancedEXT_maxindex _glDrawArraysInstanced_maxindex -#define _glDrawElementsInstancedEXT_maxindex _glDrawElementsInstanced_maxindex +#define _glDrawArraysInstancedARB_count _glDrawArraysInstanced_count +#define _glDrawElementsInstancedARB_count _glDrawElementsInstanced_count +#define _glDrawArraysInstancedEXT_count _glDrawArraysInstanced_count +#define _glDrawElementsInstancedEXT_count _glDrawElementsInstanced_count static inline GLuint -_glDrawArraysIndirect_maxindex(const GLvoid *indirect) { +_glDrawArraysIndirect_count(const GLvoid *indirect) { os::log("apitrace: warning: %s: unsupported\n", __FUNCTION__); return 0; } static inline GLuint -_glDrawElementsIndirect_maxindex(GLenum type, const GLvoid *indirect) { +_glDrawElementsIndirect_count(GLenum type, const GLvoid *indirect) { os::log("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); +_glMultiDrawArrays_count(const GLint *first, const GLsizei *count, GLsizei drawcount) { + GLuint _count = 0; + for (GLsizei draw = 0; draw < drawcount; ++draw) { + GLuint _count_draw = _glDrawArrays_count(first[draw], count[draw]); + _count = std::max(_count, _count_draw); } - return maxindex; + return _count; } 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); +_glMultiDrawElements_count(const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount) { + GLuint _count = 0; + for (GLsizei draw = 0; draw < drawcount; ++draw) { + GLuint _count_draw = _glDrawElements_count(count[draw], type, indices[draw]); + _count = std::max(_count, _count_draw); } - return maxindex; + return _count; } 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); +_glMultiDrawElementsBaseVertex_count(const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount, const GLint * basevertex) { + GLuint _count = 0; + for (GLsizei draw = 0; draw < drawcount; ++draw) { + GLuint _count_draw = _glDrawElementsBaseVertex_count(count[draw], type, indices[draw], basevertex[draw]); + _count = std::max(_count, _count_draw); } - return maxindex; + return _count; } -#define _glMultiDrawArraysEXT_maxindex _glMultiDrawArrays_maxindex -#define _glMultiDrawElementsEXT_maxindex _glMultiDrawElements_maxindex +#define _glMultiDrawArraysEXT_count _glMultiDrawArrays_count +#define _glMultiDrawElementsEXT_count _glMultiDrawElements_count -#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) +#define _glMultiModeDrawArraysIBM_count(first, count, drawcount, modestride) _glMultiDrawArrays_count(first, count, drawcount) +#define _glMultiModeDrawElementsIBM_count(count, type, indices, drawcount, modestride) _glMultiDrawElements_count(count, type, (const GLvoid **)indices, drawcount) static inline size_t