]> git.cworth.org Git - apitrace/blobdiff - glsize.hpp
projects / apitrace / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add a top-level apitrace program.
[apitrace] / glsize.hpp
diff --git a/glsize.hpp b/glsize.hpp
index 257d59913e46d0b5f4b7c8cd9e69eec3792f7594..00356ae7c64cb52383b654f38666fe0f6f0615b9 100644 (file)
--- 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.
@@ -63,7 +64,7 @@ __gl_type_size(GLenum type)
     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;
     }
 }
@@ -267,7 +268,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;
@@ -316,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
@@ -358,7 +360,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) {
@@ -376,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
@@ -389,13 +396,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;
 }
 
@@ -442,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)
 {
@@ -482,7 +476,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;
     }
 
@@ -522,7 +516,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;
     }
 
@@ -537,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:
@@ -626,7 +563,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;
     }
 }
@@ -645,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;
@@ -695,7 +632,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;
     }
@@ -720,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);
@@ -744,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)
@@ -820,7 +734,7 @@ __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;
     }
 }
Carl's hacks to apitrace (upstream at https://github.com/apitrace/apitrace)