X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glsize.hpp;h=d81cdf1fe6071db14ac6853b6d4a3a5fa3405d62;hb=67964385bd2abb065787c52625ed19dbe08f2bf8;hp=646899e934901117c805c2330d2d540e4387fb65;hpb=ff8848b5a7f01ea132ec3c9778e48dbaa617bc6a;p=apitrace diff --git a/glsize.hpp b/glsize.hpp index 646899e..d81cdf1 100644 --- a/glsize.hpp +++ b/glsize.hpp @@ -60,11 +60,12 @@ __gl_type_size(GLenum type) case GL_UNSIGNED_INT: case GL_FLOAT: case GL_4_BYTES: + case GL_FIXED: return 4; case GL_DOUBLE: return 8; default: - OS::DebugMessage("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, type); + os::log("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, type); return 0; } } @@ -268,7 +269,7 @@ __gl_uniform_size(GLenum type, GLenum &elemType, GLint &numElems) { numElems = 1; break; default: - OS::DebugMessage("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, type); + os::log("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, type); elemType = GL_NONE; numElems = 0; return; @@ -360,7 +361,7 @@ __glDrawElementsBaseVertex_maxindex(GLsizei count, GLenum type, const GLvoid *in } } } else { - OS::DebugMessage("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, type); + os::log("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, type); } if (__element_array_buffer) { @@ -396,13 +397,13 @@ __glDrawElementsBaseVertex_maxindex(GLsizei count, GLenum type, const GLvoid *in static inline GLuint __glDrawArraysIndirect_maxindex(const GLvoid *indirect) { - OS::DebugMessage("apitrace: warning: %s: unsupported\n", __FUNCTION__); + os::log("apitrace: warning: %s: unsupported\n", __FUNCTION__); return 0; } static inline GLuint __glDrawElementsIndirect_maxindex(GLenum type, const GLvoid *indirect) { - OS::DebugMessage("apitrace: warning: %s: unsupported\n", __FUNCTION__); + os::log("apitrace: warning: %s: unsupported\n", __FUNCTION__); return 0; } @@ -449,19 +450,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) { @@ -489,7 +477,7 @@ __glMap1d_size(GLenum target, GLint stride, GLint order) channels = 4; break; default: - OS::DebugMessage("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, target); + os::log("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, target); return 0; } @@ -529,7 +517,7 @@ __glMap2d_size(GLenum target, GLint ustride, GLint uorder, GLint vstride, GLint channels = 4; break; default: - OS::DebugMessage("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, target); + os::log("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, target); return 0; } @@ -544,63 +532,6 @@ __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 unsigned __gl_format_channels(GLenum format) { switch (format) { @@ -633,7 +564,7 @@ __gl_format_channels(GLenum format) { case GL_CMYKA_EXT: return 5; default: - OS::DebugMessage("apitrace: warning: %s: unexpected format GLenum 0x%04X\n", __FUNCTION__, format); + os::log("apitrace: warning: %s: unexpected format GLenum 0x%04X\n", __FUNCTION__, format); return 0; } } @@ -651,7 +582,7 @@ _align(X x, Y y) { } static inline size_t -__gl_image_size(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsizei depth) { +__gl_image_size(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsizei depth, GLboolean has_unpack_subimage) { unsigned num_channels = __gl_format_channels(format); unsigned bits_per_pixel; @@ -702,7 +633,7 @@ __gl_image_size(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsiz bits_per_pixel = 64; break; default: - OS::DebugMessage("apitrace: warning: %s: unexpected type GLenum 0x%04X\n", __FUNCTION__, type); + os::log("apitrace: warning: %s: unexpected type GLenum 0x%04X\n", __FUNCTION__, type); bits_per_pixel = 0; break; } @@ -714,12 +645,14 @@ __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_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_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); + } if (row_length <= 0) { row_length = width; @@ -751,32 +684,10 @@ __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) +// 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) @@ -827,24 +738,45 @@ __glClearBuffer_size(GLenum buffer) case GL_STENCIL: return 1; default: - OS::DebugMessage("apitrace: warning: %s: unexpected buffer GLenum 0x%04X\n", __FUNCTION__, buffer); + os::log("apitrace: warning: %s: unexpected buffer GLenum 0x%04X\n", __FUNCTION__, buffer); return 0; } } /* - * 0 terminated integer/float attribute list. + * attribute list, terminated by the given terminator. */ template static inline size_t -__AttribList_size(const T *pAttribList) +__AttribList_size(const T *pAttribList, const T terminator = static_cast(0)) { size_t size = 0; if (pAttribList) { do { ++size; - } while (*pAttribList++); + } while (*pAttribList++ != terminator); + } + + return size; +} + + +/* + * (key, value) attribute list, terminated by the given terminator. + */ +template +static inline size_t +__AttribPairList_size(const T *pAttribList, const T terminator = static_cast(0)) +{ + size_t size = 0; + + if (pAttribList) { + while (pAttribList[size] != terminator) { + size += 2; + } + // terminator also counts + ++size; } return size;