Show the call for which the surface we're displaying.

[apitrace] / glsize.hpp

diff --git a/glsize.hpp b/glsize.hpp
index 90e1c39fe439585aaab40f75bea9fefc2a41d337..3a94d05a3726c7fab97f5c0178c941dfeb9231b8 100644 (file)
--- a/glsize.hpp
+++ b/glsize.hpp
@@ -306,6 +306,7 @@ __glTexParameterfv_size(GLenum pname)
     case GL_TEXTURE_BORDER_COLOR:
     case GL_POST_TEXTURE_FILTER_BIAS_SGIX:
     case GL_POST_TEXTURE_FILTER_SCALE_SGIX:
+    case GL_TEXTURE_SWIZZLE_RGBA:
         return 4;
     default:
         OS::DebugMessage("warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, pname);
@@ -343,8 +344,18 @@ __glTexEnvfv_size(GLenum pname)
     case GL_OPERAND3_ALPHA_NV:
     case GL_BUMP_TARGET_ATI:
     case GL_COORD_REPLACE_ARB:
+    case GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV:
+    case GL_SHADER_OPERATION_NV:
+    case GL_PREVIOUS_TEXTURE_INPUT_NV:
+    case GL_OFFSET_TEXTURE_SCALE_NV:
+    case GL_OFFSET_TEXTURE_BIAS_NV:
+    case GL_SHADER_CONSISTENT_NV:
 /*  case GL_COORD_REPLACE_NV:*/
         return 1;
+    case GL_CONST_EYE_NV:
+        return 3;
+    case GL_CULL_MODES_NV:
+    case GL_OFFSET_TEXTURE_MATRIX_NV:
     case GL_TEXTURE_ENV_COLOR:
         return 4;
     default:
@@ -429,6 +440,7 @@ __glGetBooleanv_size(GLenum pname)
 {
     switch (pname) {
     case GL_CURRENT_INDEX:
+    case GL_CURRENT_PROGRAM:
     case GL_CURRENT_RASTER_INDEX:
     case GL_CURRENT_RASTER_POSITION_VALID:
     case GL_CURRENT_RASTER_DISTANCE:
@@ -860,6 +872,11 @@ __glGetBooleanv_size(GLenum pname)
 /*  case GL_MAX_SAMPLES_EXT:*/
     case GL_MAX_SERVER_WAIT_TIMEOUT:
     case GL_RASTER_POSITION_UNCLIPPED_IBM:
+    case GL_PROVOKING_VERTEX_EXT:
+    case GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT:
+    case GL_VERTEX_ARRAY_RANGE_LENGTH_NV:
+    case GL_VERTEX_ARRAY_RANGE_VALID_NV:
+    case GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV:
         return 1;
     case GL_SMOOTH_POINT_SIZE_RANGE:
     case GL_LINE_WIDTH_RANGE:
@@ -1401,8 +1418,7 @@ __glGetFramebufferAttachmentParameterivEXT_size(GLenum pname)
 #define __glGetFramebufferAttachmentParameteriv_size __glGetFramebufferAttachmentParameterivEXT_size
 
 static inline size_t
-__glTexImage3D_size(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsizei depth, GLint border) {
-    size_t num_channels;
+__gl_format_channels(GLenum format) {
     switch (format) {
     case GL_COLOR_INDEX:
     case GL_RED:
@@ -1413,24 +1429,26 @@ __glTexImage3D_size(GLenum format, GLenum type, GLsizei width, GLsizei height, G
     case GL_LUMINANCE:
     case GL_DEPTH_COMPONENT:
     case GL_STENCIL_INDEX:
-        num_channels = 1;
-        break;
+        return 1;
+    case GL_DEPTH_STENCIL:
     case GL_LUMINANCE_ALPHA:
-        num_channels = 2;
-        break;
+    case GL_RG:
+        return 2;
     case GL_RGB:
     case GL_BGR:
-        num_channels = 3;
-        break;
+        return 3;
     case GL_RGBA:
     case GL_BGRA:
-        num_channels = 4;
-        break;
+        return 4;
     default:
         OS::DebugMessage("warning: %s: unexpected format GLenum 0x%04X\n", __FUNCTION__, format);
-        num_channels = 0;
-        break;
+        return 0;
     }
+}
+
+static inline size_t
+__glTexImage3D_size(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsizei depth, GLint border) {
+    size_t num_channels = __gl_format_channels(format);
 
     size_t bits_per_pixel;
     switch (type) {
@@ -1443,6 +1461,7 @@ __glTexImage3D_size(GLenum format, GLenum type, GLsizei width, GLsizei height, G
         break;
     case GL_SHORT:
     case GL_UNSIGNED_SHORT:
+    case GL_HALF_FLOAT:
         bits_per_pixel = 16 * num_channels;
         break;
     case GL_INT:
@@ -1466,6 +1485,7 @@ __glTexImage3D_size(GLenum format, GLenum type, GLsizei width, GLsizei height, G
     case GL_UNSIGNED_INT_8_8_8_8_REV:
     case GL_UNSIGNED_INT_10_10_10_2:
     case GL_UNSIGNED_INT_2_10_10_10_REV:
+    case GL_UNSIGNED_INT_24_8:
         bits_per_pixel = 32;
         break;
     default: