case GL_BYTE:
case GL_UNSIGNED_BYTE:
return 1;
- break;
case GL_SHORT:
case GL_UNSIGNED_SHORT:
case GL_2_BYTES:
case GL_HALF_FLOAT:
return 2;
- break;
case GL_3_BYTES:
return 3;
- break;
case GL_INT:
case GL_UNSIGNED_INT:
case GL_FLOAT:
case GL_4_BYTES:
return 4;
- break;
case GL_DOUBLE:
return 8;
- break;
default:
OS::DebugMessage("warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, type);
return 0;
static inline size_t
__glArrayPointer_size(GLint size, GLenum type, GLsizei stride, GLsizei maxIndex)
{
- GLsizei elementSize = size*__gl_type_size(type);
+ size_t elementSize = size*__gl_type_size(type);
if (!stride) {
- stride = elementSize;
+ stride = (GLsizei)elementSize;
}
return stride*maxIndex + elementSize;
}
#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 size_t
+static inline GLuint
__glDrawArrays_maxindex(GLint first, GLsizei count)
{
+ if (!count) {
+ return 0;
+ }
return first + count - 1;
}
-static inline size_t
-__glDrawElements_maxindex(GLsizei count, GLenum type, const GLvoid *_indices)
+static inline GLuint
+__glDrawElements_maxindex(GLsizei count, GLenum type, const GLvoid *indices)
{
- size_t maxindex = 0;
- unsigned i;
+ 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
+ GLintptr offset = (GLintptr)indices;
+ GLsizeiptr size = count*__gl_type_size(type);
+ GLvoid *temp = malloc(size);
+ if (!temp) {
+ return 0;
+ }
+ memset(temp, 0, size);
+ __glGetBufferSubData(GL_ELEMENT_ARRAY_BUFFER, offset, size, temp);
+ indices = temp;
+ } else {
+ if (!indices) {
+ return 0;
+ }
+ }
+ GLuint maxindex = 0;
+ GLsizei i;
if (type == GL_UNSIGNED_BYTE) {
- const GLubyte *indices = (const GLubyte *)_indices;
+ const GLubyte *p = (const GLubyte *)indices;
for (i = 0; i < count; ++i) {
- if (indices[i] > maxindex) {
- maxindex = indices[i];
+ if (p[i] > maxindex) {
+ maxindex = p[i];
}
}
} else if (type == GL_UNSIGNED_SHORT) {
- const GLushort *indices = (const GLushort *)_indices;
+ const GLushort *p = (const GLushort *)indices;
for (i = 0; i < count; ++i) {
- if (indices[i] > maxindex) {
- maxindex = indices[i];
+ if (p[i] > maxindex) {
+ maxindex = p[i];
}
}
} else if (type == GL_UNSIGNED_INT) {
- const GLuint *indices = (const GLuint *)_indices;
+ const GLuint *p = (const GLuint *)indices;
for (i = 0; i < count; ++i) {
- if (indices[i] > maxindex) {
- maxindex = indices[i];
+ if (p[i] > maxindex) {
+ maxindex = p[i];
}
}
} else {
OS::DebugMessage("warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, type);
}
+ if (__element_array_buffer) {
+ free(temp);
+ }
+
return maxindex;
}
-static inline size_t
+static inline GLuint
__glDrawRangeElements_maxindex(GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid * indices)
{
+ (void)start;
+ (void)end;
return __glDrawElements_maxindex(count, type, indices);
}
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);
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:
{
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:
case GL_DEPTH_BOUNDS_TEST_EXT:
case GL_ARRAY_BUFFER_BINDING_ARB:
case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
+ case GL_PIXEL_PACK_BUFFER_BINDING:
+ case GL_PIXEL_UNPACK_BUFFER_BINDING:
case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:
case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:
case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:
/* 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:
#define __glGetIntegerv_size __glGetBooleanv_size
+#define __glGetInteger64v_size __glGetBooleanv_size
+
#define __glGetLightfv_size __glLightfv_size
#define __glGetLightiv_size __glLightfv_size
#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:
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) {
break;
case GL_SHORT:
case GL_UNSIGNED_SHORT:
+ case GL_HALF_FLOAT:
bits_per_pixel = 16 * num_channels;
break;
case GL_INT:
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;
}
#define __glBitmap_size(width, height) __glTexImage2D_size(GL_COLOR_INDEX, GL_BITMAP, width, height, 0)
#define __glPolygonStipple_size() __glBitmap_size(32, 32)
+
+/*
+ * 0 terminated integer/float attribute list.
+ */
+template<class T>
+static inline size_t
+__AttribList_size(const T *pAttribList)
+{
+ size_t size = 0;
+
+ if (pAttribList) {
+ do {
+ ++size;
+ } while (*pAttribList++);
+ }
+
+ return size;
+}
+
+
#endif /* _GL_HELPERS_HPP_ */
projects / apitrace / blobdiff