X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=helpers%2Fglsize.hpp;h=c4fe9bf9c866b5aa19c0b4283a9acf3998c39102;hb=ddf6d2c5e347f8ca25dad4d9be4a1494d8929d30;hp=d81cdf1fe6071db14ac6853b6d4a3a5fa3405d62;hpb=003fbab2d87c2d8c2aa6bf15c8f9c21a40fee2eb;p=apitrace diff --git a/helpers/glsize.hpp b/helpers/glsize.hpp index d81cdf1..c4fe9bf 100644 --- a/helpers/glsize.hpp +++ b/helpers/glsize.hpp @@ -37,12 +37,14 @@ #include +#include + #include "os.hpp" #include "glimports.hpp" static inline size_t -__gl_type_size(GLenum type) +_gl_type_size(GLenum type) { switch (type) { case GL_BOOL: @@ -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,70 +284,102 @@ __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) { - size_t elementSize = size*__gl_type_size(type); + if (!count) { + return 0; + } + + if (size == GL_BGRA) { + size = 4; + } + + if (size > 4) { + os::log("apitrace: warning: %s: unexpected size 0x%04X\n", __FUNCTION__, size); + } + + 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, 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) + +/** + * Same as glGetIntegerv, but passing the result in the return value. + */ +static inline GLint +_glGetInteger(GLenum pname) { + GLint param = 0; + _glGetIntegerv(pname, ¶m); + return param; } -#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) +static inline GLint +_element_array_buffer_binding(void) { + return _glGetInteger(GL_ELEMENT_ARRAY_BUFFER_BINDING); +} 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 + +/* Forward declaration for definition in gltrace.py */ +void +_shadow_glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, + GLvoid *data); 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; if (!count) { return 0; } - __glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING, &__element_array_buffer); - if (__element_array_buffer) { + GLint element_array_buffer = _element_array_buffer_binding(); + if (element_array_buffer) { // Read indices from index buffer object GLintptr offset = (GLintptr)indices; - GLsizeiptr size = count*__gl_type_size(type); + GLsizeiptr size = count*_gl_type_size(type); GLvoid *temp = malloc(size); if (!temp) { return 0; } memset(temp, 0, size); - __glGetBufferSubData(GL_ELEMENT_ARRAY_BUFFER, offset, size, temp); + _shadow_glGetBufferSubData(GL_ELEMENT_ARRAY_BUFFER, offset, size, temp); indices = temp; } else { if (!indices) { @@ -364,94 +414,94 @@ __glDrawElementsBaseVertex_maxindex(GLsizei count, GLenum type, const GLvoid *in os::log("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, type); } - if (__element_array_buffer) { + if (element_array_buffer) { free(temp); } 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 -__glCallLists_size(GLsizei n, GLenum type) +_glCallLists_size(GLsizei n, GLenum type) { - return n*__gl_type_size(type); + return n*_gl_type_size(type); } static inline size_t -__glMap1d_size(GLenum target, GLint stride, GLint order) +_glMap1d_size(GLenum target, GLint stride, GLint order) { if (order < 1) { return 0; @@ -488,10 +538,10 @@ __glMap1d_size(GLenum target, GLint stride, GLint order) return channels + stride * (order - 1); } -#define __glMap1f_size __glMap1d_size +#define _glMap1f_size _glMap1d_size static inline size_t -__glMap2d_size(GLenum target, GLint ustride, GLint uorder, GLint vstride, GLint vorder) +_glMap2d_size(GLenum target, GLint ustride, GLint uorder, GLint vstride, GLint vorder) { if (uorder < 1 || vorder < 1) { return 0; @@ -530,10 +580,10 @@ __glMap2d_size(GLenum target, GLint ustride, GLint uorder, GLint vstride, GLint vstride * (vorder - 1); } -#define __glMap2f_size __glMap2d_size +#define _glMap2f_size _glMap2d_size static inline unsigned -__gl_format_channels(GLenum format) { +_gl_format_channels(GLenum format) { switch (format) { case GL_COLOR_INDEX: case GL_RED: @@ -581,32 +631,36 @@ _align(X x, Y y) { return (x + (y - 1)) & ~(y - 1); } -static inline size_t -__gl_image_size(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsizei depth, GLboolean has_unpack_subimage) { - unsigned num_channels = __gl_format_channels(format); +static inline void +_gl_format_size(GLenum format, GLenum type, + unsigned & bits_per_element, unsigned & bits_per_pixel) +{ + unsigned num_channels = _gl_format_channels(format); - unsigned bits_per_pixel; switch (type) { case GL_BITMAP: - bits_per_pixel = 1; + bits_per_pixel = bits_per_element = 1; break; case GL_BYTE: case GL_UNSIGNED_BYTE: - bits_per_pixel = 8 * num_channels; + bits_per_element = 8; + bits_per_pixel = bits_per_element * num_channels; break; case GL_SHORT: case GL_UNSIGNED_SHORT: case GL_HALF_FLOAT: - bits_per_pixel = 16 * num_channels; + bits_per_element = 16; + bits_per_pixel = bits_per_element * num_channels; break; case GL_INT: case GL_UNSIGNED_INT: case GL_FLOAT: - bits_per_pixel = 32 * num_channels; + bits_per_element = 32; + bits_per_pixel = bits_per_element * num_channels; break; case GL_UNSIGNED_BYTE_3_3_2: case GL_UNSIGNED_BYTE_2_3_3_REV: - bits_per_pixel = 8; + bits_per_pixel = bits_per_element = 8; break; case GL_UNSIGNED_SHORT_4_4_4_4: case GL_UNSIGNED_SHORT_4_4_4_4_REV: @@ -616,7 +670,7 @@ __gl_image_size(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsiz case GL_UNSIGNED_SHORT_5_6_5_REV: case GL_UNSIGNED_SHORT_8_8_MESA: case GL_UNSIGNED_SHORT_8_8_REV_MESA: - bits_per_pixel = 16; + bits_per_pixel = bits_per_element = 16; break; case GL_UNSIGNED_INT_8_8_8_8: case GL_UNSIGNED_INT_8_8_8_8_REV: @@ -627,16 +681,32 @@ __gl_image_size(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsiz case GL_UNSIGNED_INT_5_9_9_9_REV: case GL_UNSIGNED_INT_S8_S8_8_8_NV: case GL_UNSIGNED_INT_8_8_S8_S8_REV_NV: - bits_per_pixel = 32; + bits_per_pixel = bits_per_element = 32; break; case GL_FLOAT_32_UNSIGNED_INT_24_8_REV: - bits_per_pixel = 64; + bits_per_pixel = bits_per_element = 64; break; default: os::log("apitrace: warning: %s: unexpected type GLenum 0x%04X\n", __FUNCTION__, type); - bits_per_pixel = 0; + bits_per_pixel = bits_per_element = 0; break; } +} + +static inline size_t +_glClearBufferData_size(GLenum format, GLenum type) { + unsigned bits_per_element; + unsigned bits_per_pixel; + _gl_format_size(format, type, bits_per_element, bits_per_pixel); + return (bits_per_pixel + 7)/8; +} + +static inline size_t +_gl_image_size(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsizei depth, GLboolean has_unpack_subimage) { + + unsigned bits_per_element; + unsigned bits_per_pixel; + _gl_format_size(format, type, bits_per_element, bits_per_pixel); GLint alignment = 4; GLint row_length = 0; @@ -645,13 +715,13 @@ __gl_image_size(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsiz GLint skip_pixels = 0; GLint skip_images = 0; - __glGetIntegerv(GL_UNPACK_ALIGNMENT, &alignment); + _glGetIntegerv(GL_UNPACK_ALIGNMENT, &alignment); if (has_unpack_subimage) { - __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); + _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) { @@ -660,9 +730,11 @@ __gl_image_size(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsiz size_t row_stride = (row_length*bits_per_pixel + 7)/8; - if ((GLint)bits_per_pixel < alignment*8 && - (bits_per_pixel & 7) == 0 && - _is_pot(bits_per_pixel)) { + if ((bits_per_element == 1*8 || + bits_per_element == 2*8 || + bits_per_element == 4*8 || + bits_per_element == 8*8) && + (GLint)bits_per_element < alignment*8) { row_stride = _align(row_stride, alignment); } @@ -685,46 +757,46 @@ __gl_image_size(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsiz } // note that can_unpack_subimage() is generated by gltrace.py -#define __glTexImage3D_size(format, type, width, height, depth) __gl_image_size(format, type, width, height, depth, can_unpack_subimage()) -#define __glTexImage2D_size(format, type, width, height) __gl_image_size(format, type, width, height, 1, can_unpack_subimage()) -#define __glTexImage1D_size(format, type, width) __gl_image_size(format, type, width, 1, 1, can_unpack_subimage()) - -#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) -#define __glTexSubImage1D_size(format, type, width) __glTexImage1D_size(format, type, width) - -#define __glTexImage3DEXT_size __glTexImage3D_size -#define __glTexImage2DEXT_size __glTexImage2D_size -#define __glTexImage1DEXT_size __glTexImage1D_size -#define __glTexSubImage3DEXT_size __glTexSubImage3D_size -#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) +#define _glTexImage3D_size(format, type, width, height, depth) _gl_image_size(format, type, width, height, depth, can_unpack_subimage()) +#define _glTexImage2D_size(format, type, width, height) _gl_image_size(format, type, width, height, 1, can_unpack_subimage()) +#define _glTexImage1D_size(format, type, width) _gl_image_size(format, type, width, 1, 1, can_unpack_subimage()) + +#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) +#define _glTexSubImage1D_size(format, type, width) _glTexImage1D_size(format, type, width) + +#define _glTexImage3DEXT_size _glTexImage3D_size +#define _glTexImage2DEXT_size _glTexImage2D_size +#define _glTexImage1DEXT_size _glTexImage1D_size +#define _glTexSubImage3DEXT_size _glTexSubImage3D_size +#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) +_glClearBuffer_size(GLenum buffer) { switch (buffer) { case GL_COLOR: @@ -748,7 +820,7 @@ __glClearBuffer_size(GLenum buffer) */ template static inline size_t -__AttribList_size(const T *pAttribList, const T terminator = static_cast(0)) +_AttribList_size(const T *pAttribList, const T terminator = static_cast(0)) { size_t size = 0; @@ -767,7 +839,7 @@ __AttribList_size(const T *pAttribList, const T terminator = static_cast(0)) */ template static inline size_t -__AttribPairList_size(const T *pAttribList, const T terminator = static_cast(0)) +_AttribPairList_size(const T *pAttribList, const T terminator = static_cast(0)) { size_t size = 0;