Don't overflow the max index when the app isn't rendering anything.

[apitrace] / glsize.hpp

diff --git a/glsize.hpp b/glsize.hpp
index 96a909a7666b6d199d82f9830df823ca99105f17..838625aba0a73b64fbd9a074582d3ba092b330a0 100644 (file)
--- a/glsize.hpp
+++ b/glsize.hpp
@@ -89,10 +89,14 @@ __glArrayPointer_size(GLint size, GLenum type, GLsizei stride, GLsizei 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)
 
 static inline GLuint
 __glDrawArrays_maxindex(GLint first, GLsizei count)
 {
+    if (!count) {
+        return 0;
+    }
     return first + count - 1;
 }
 
@@ -101,6 +105,10 @@ __glDrawElements_maxindex(GLsizei count, GLenum type, const GLvoid *indices)
 {
     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) {
         // Read indices from index buffer object
@@ -305,6 +313,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);
@@ -342,8 +351,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:
@@ -428,6 +447,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:
@@ -859,6 +879,12 @@ __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:
+    case GL_VERTEX_ARRAY_BINDING:
         return 1;
     case GL_SMOOTH_POINT_SIZE_RANGE:
     case GL_LINE_WIDTH_RANGE:
@@ -959,6 +985,8 @@ __glGetBooleanv_size(GLenum pname)
 
 #define __glGetIntegerv_size __glGetBooleanv_size
 
+#define __glGetInteger64v_size __glGetBooleanv_size
+
 #define __glGetLightfv_size __glLightfv_size
 
 #define __glGetLightiv_size __glLightfv_size
@@ -1398,8 +1426,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:
@@ -1407,26 +1434,29 @@ __glTexImage3D_size(GLenum format, GLenum type, GLsizei width, GLsizei height, G
     case GL_BLUE:
     case GL_ALPHA:
     case GL_INTENSITY:
+    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 GLenum 0x%04X\n", __FUNCTION__, format);
-        num_channels = 0;
-        break;
+        OS::DebugMessage("warning: %s: unexpected format GLenum 0x%04X\n", __FUNCTION__, format);
+        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) {
@@ -1439,6 +1469,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:
@@ -1448,24 +1479,25 @@ __glTexImage3D_size(GLenum format, GLenum type, GLsizei width, GLsizei height, G
         break;
     case GL_UNSIGNED_BYTE_3_3_2:
     case GL_UNSIGNED_BYTE_2_3_3_REV:
-    case GL_UNSIGNED_SHORT_5_6_5:
-    case GL_UNSIGNED_SHORT_5_6_5_REV:
         bits_per_pixel = 8;
         break;
     case GL_UNSIGNED_SHORT_4_4_4_4:
     case GL_UNSIGNED_SHORT_4_4_4_4_REV:
     case GL_UNSIGNED_SHORT_5_5_5_1:
     case GL_UNSIGNED_SHORT_1_5_5_5_REV:
+    case GL_UNSIGNED_SHORT_5_6_5:
+    case GL_UNSIGNED_SHORT_5_6_5_REV:
         bits_per_pixel = 16;
         break;
     case GL_UNSIGNED_INT_8_8_8_8:
     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:
-        OS::DebugMessage("warning: %s: unexpected GLenum 0x%04X\n", __FUNCTION__, type);
+        OS::DebugMessage("warning: %s: unexpected type GLenum 0x%04X\n", __FUNCTION__, type);
         bits_per_pixel = 0;
         break;
     }