Add missing file to glxtrace.so

[apitrace] / glsize.hpp

diff --git a/glsize.hpp b/glsize.hpp
index bd933dc8be409aaf1e53a0bb5d9a42cf53cd3cfe..8e1846a96a0ad17f48797ff119906e4e1556330b 100644 (file)
--- a/glsize.hpp
+++ b/glsize.hpp
@@ -34,6 +34,8 @@
 #define _GL_SIZE_HPP_
 
 
+#include <string.h>
+
 #include "os.hpp"
 #include "glimports.hpp"
 
@@ -85,6 +87,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)
@@ -332,6 +336,11 @@ __glMap2d_size(GLenum target, GLint ustride, GLint uorder, GLint vstride, GLint
 #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
@@ -401,7 +410,11 @@ __gl_format_channels(GLenum format) {
         return 3;
     case GL_RGBA:
     case GL_BGRA:
+    case GL_ABGR_EXT:
+    case GL_CMYK_EXT:
         return 4;
+    case GL_CMYKA_EXT:
+        return 5;
     default:
         OS::DebugMessage("apitrace: warning: %s: unexpected format GLenum 0x%04X\n", __FUNCTION__, format);
         return 0;
@@ -417,7 +430,7 @@ _is_pot(X x) {
 template<class X, class Y>
 static inline X
 _align(X x, Y y) {
-    return (x + (y - 1)) & (y - 1);
+    return (x + (y - 1)) & ~(y - 1);
 }
 
 static inline size_t
@@ -527,6 +540,10 @@ __gl_image_size(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsiz
 #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
@@ -570,10 +587,33 @@ __gl_image_size(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsiz
 #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.