It appears that upstream are preferring void over GLvoid.

This commit is contained in:
Nigel Stewart 2014-01-08 17:22:37 -06:00
parent 8c7447addb
commit b96cf5f05e
28 changed files with 580 additions and 574 deletions

View File

@ -79,10 +79,6 @@ EOT
perl -e's/OCCLUSION_TEST_RESULT_HP.*/OCCLUSION_TEST_RESULT_HP 0x8166/' -pi \
$1/GL_HP_occlusion_test
# fix GLvoid in GL_ARB_vertex_buffer_objects
perl -e 's/ void\*/ GLvoid\*/g' -pi \
$1/GL_ARB_vertex_buffer_object
# add deprecated constants to GL_ATI_fragment_shader
cat >> $1/GL_ATI_fragment_shader <<EOT
GL_NUM_FRAGMENT_REGISTERS_ATI 0x896E
@ -441,7 +437,7 @@ EOT
# Probably ought to be explicitly mentioned in the spec language
cat >> $1/GL_REGAL_log <<EOT
typedef void (APIENTRY *LOGPROCREGAL)(GLenum stream, GLsizei length, const GLchar *message, GLvoid *context)
typedef void (APIENTRY *LOGPROCREGAL)(GLenum stream, GLsizei length, const GLchar *message, void *context)
EOT
# Fixup LOGPROCREGAL -> GLLOGPROCREGAL

View File

@ -237,10 +237,12 @@ sub parse_spec($)
{
# apply typemaps
$return =~ s/$regex{types}/$typemap{$1}/og;
$return =~ s/void\*/GLvoid */og;
$return =~ s/GLvoid/void/og;
$return =~ s/void\*/void */og;
$parms =~ s/$regex{types}/$typemap{$1}/og;
$parms =~ s/$regex{voidtype}/$voidtypemap{$1}/og;
$parms =~ s/ void\* / GLvoid */og;
$parms =~ s/GLvoid/void/og;
$parms =~ s/ void\* / void */og;
}
# add to functions hash
$functions{$name} = {

View File

@ -7,6 +7,6 @@ GL_APPLE_texture_range
GL_STORAGE_SHARED_APPLE 0x85BF
GL_TEXTURE_RANGE_LENGTH_APPLE 0x85B7
GL_TEXTURE_RANGE_POINTER_APPLE 0x85B8
void glTextureRangeAPPLE (GLenum target, GLsizei length, GLvoid *pointer)
void glGetTexParameterPointervAPPLE (GLenum target, GLenum pname, GLvoid **params)
void glTextureRangeAPPLE (GLenum target, GLsizei length, void *pointer)
void glGetTexParameterPointervAPPLE (GLenum target, GLenum pname, void **params)

View File

@ -78,35 +78,35 @@ GL_ARB_imaging
GL_WRAP_BORDER 0x8152
GL_REPLICATE_BORDER 0x8153
GL_CONVOLUTION_BORDER_COLOR 0x8154
void glColorTable (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table)
void glColorSubTable (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data)
void glColorTable (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table)
void glColorSubTable (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data)
void glColorTableParameteriv (GLenum target, GLenum pname, const GLint *params)
void glColorTableParameterfv (GLenum target, GLenum pname, const GLfloat *params)
void glCopyColorSubTable (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
void glCopyColorTable (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
void glGetColorTable (GLenum target, GLenum format, GLenum type, GLvoid *table)
void glGetColorTable (GLenum target, GLenum format, GLenum type, void *table)
void glGetColorTableParameterfv (GLenum target, GLenum pname, GLfloat *params)
void glGetColorTableParameteriv (GLenum target, GLenum pname, GLint *params)
void glHistogram (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
void glResetHistogram (GLenum target)
void glGetHistogram (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
void glGetHistogram (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values)
void glGetHistogramParameterfv (GLenum target, GLenum pname, GLfloat *params)
void glGetHistogramParameteriv (GLenum target, GLenum pname, GLint *params)
void glMinmax (GLenum target, GLenum internalformat, GLboolean sink)
void glResetMinmax (GLenum target)
void glGetMinmaxParameterfv (GLenum target, GLenum pname, GLfloat *params)
void glGetMinmaxParameteriv (GLenum target, GLenum pname, GLint *params)
void glConvolutionFilter1D (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
void glConvolutionFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)
void glConvolutionFilter1D (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image)
void glConvolutionFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image)
void glConvolutionParameterf (GLenum target, GLenum pname, GLfloat params)
void glConvolutionParameterfv (GLenum target, GLenum pname, const GLfloat *params)
void glConvolutionParameteri (GLenum target, GLenum pname, GLint params)
void glConvolutionParameteriv (GLenum target, GLenum pname, const GLint *params)
void glCopyConvolutionFilter1D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
void glCopyConvolutionFilter2D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
void glGetConvolutionFilter (GLenum target, GLenum format, GLenum type, GLvoid *image)
void glGetConvolutionFilter (GLenum target, GLenum format, GLenum type, void *image)
void glGetConvolutionParameterfv (GLenum target, GLenum pname, GLfloat *params)
void glGetConvolutionParameteriv (GLenum target, GLenum pname, GLint *params)
void glSeparableFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)
void glGetSeparableFilter (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span)
void glGetMinmax (GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values)
void glSeparableFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column)
void glGetSeparableFilter (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span)
void glGetMinmax (GLenum target, GLboolean reset, GLenum format, GLenum types, void *values)

View File

@ -12,7 +12,7 @@ GL_ARB_matrix_palette
GL_MATRIX_INDEX_ARRAY_STRIDE_ARB 0x8848
GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
void glCurrentPaletteMatrixARB (GLint index)
void glMatrixIndexPointerARB (GLint size, GLenum type, GLsizei stride, GLvoid *pointer)
void glMatrixIndexPointerARB (GLint size, GLenum type, GLsizei stride, void *pointer)
void glMatrixIndexubvARB (GLint size, GLubyte *indices)
void glMatrixIndexusvARB (GLint size, GLushort *indices)
void glMatrixIndexuivARB (GLint size, GLuint *indices)

View File

@ -21,7 +21,7 @@ GL_ARB_robustness
void glGetnPixelMapuivARB (GLenum map, GLsizei bufSize, GLuint* values)
void glGetnPixelMapusvARB (GLenum map, GLsizei bufSize, GLushort* values)
void glGetnPolygonStippleARB (GLsizei bufSize, GLubyte* pattern)
void glGetnSeparableFilterARB (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void* row, GLsizei columnBufSize, GLvoid*column, GLvoid*span)
void glGetnSeparableFilterARB (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void* row, GLsizei columnBufSize, void*column, void*span)
void glGetnTexImageARB (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void* img)
void glGetnUniformdvARB (GLuint program, GLint location, GLsizei bufSize, GLdouble* params)
void glGetnUniformfvARB (GLuint program, GLint location, GLsizei bufSize, GLfloat* params)

View File

@ -51,5 +51,5 @@ GL_ARB_vertex_blend
void glWeightubvARB (GLint size, GLubyte *weights)
void glWeightusvARB (GLint size, GLushort *weights)
void glWeightuivARB (GLint size, GLuint *weights)
void glWeightPointerARB (GLint size, GLenum type, GLsizei stride, GLvoid *pointer)
void glWeightPointerARB (GLint size, GLenum type, GLsizei stride, void *pointer)
void glVertexBlendARB (GLint count)

View File

@ -1,5 +1,5 @@
GL_ATI_map_object_buffer
http://www.opengl.org/registry/specs/ATI/map_object_buffer.txt
GL_ATI_map_object_buffer
GLvoid * glMapObjectBufferATI (GLuint buffer)
void * glMapObjectBufferATI (GLuint buffer)
void glUnmapObjectBufferATI (GLuint buffer)

View File

@ -2,4 +2,4 @@ GL_EXT_draw_instanced
http://developer.download.nvidia.com/opengl/specs/GL_EXT_draw_instanced.txt
GL_EXT_draw_instanced
void glDrawArraysInstancedEXT (GLenum mode, GLint start, GLsizei count, GLsizei primcount)
void glDrawElementsInstancedEXT (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount)
void glDrawElementsInstancedEXT (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount)

View File

@ -3,4 +3,4 @@ http://oss.sgi.com/projects/ogl-sample/registry/EXT/draw_range_elements.txt
GL_EXT_draw_range_elements
GL_MAX_ELEMENTS_VERTICES_EXT 0x80E8
GL_MAX_ELEMENTS_INDICES_EXT 0x80E9
void glDrawRangeElementsEXT (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
void glDrawRangeElementsEXT (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices)

View File

@ -13,4 +13,4 @@ GL_EXT_fog_coord
void glFogCoordfvEXT (const GLfloat *coord)
void glFogCoorddEXT (GLdouble coord)
void glFogCoorddvEXT (const GLdouble *coord)
void glFogCoordPointerEXT (GLenum type, GLsizei stride, const GLvoid *pointer)
void glFogCoordPointerEXT (GLenum type, GLsizei stride, const void *pointer)

View File

@ -58,6 +58,6 @@ GL_EXT_gpu_shader4
void glVertexAttribI4svEXT (GLuint index, const GLshort *v)
void glVertexAttribI4ubvEXT (GLuint index, const GLubyte *v)
void glVertexAttribI4usvEXT (GLuint index, const GLushort *v)
void glVertexAttribIPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
void glVertexAttribIPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer)
void glGetVertexAttribIivEXT (GLuint index, GLenum pname, GLint *params)
void glGetVertexAttribIuivEXT (GLuint index, GLenum pname, GLuint *params)

View File

@ -24,4 +24,4 @@ GL_EXT_secondary_color
void glSecondaryColor3uivEXT (const GLuint *v)
void glSecondaryColor3usEXT (GLushort red, GLushort green, GLushort blue)
void glSecondaryColor3usvEXT (const GLushort *v)
void glSecondaryColorPointerEXT (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
void glSecondaryColorPointerEXT (GLint size, GLenum type, GLsizei stride, const void *pointer)

View File

@ -125,8 +125,8 @@ GL_EXT_vertex_shader
void glInsertComponentEXT (GLuint res, GLuint src, GLuint num)
void glExtractComponentEXT (GLuint res, GLuint src, GLuint num)
GLuint glGenSymbolsEXT (GLenum dataType, GLenum storageType, GLenum range, GLuint components)
void glSetInvariantEXT (GLuint id, GLenum type, GLvoid *addr)
void glSetLocalConstantEXT (GLuint id, GLenum type, GLvoid *addr)
void glSetInvariantEXT (GLuint id, GLenum type, void *addr)
void glSetLocalConstantEXT (GLuint id, GLenum type, void *addr)
void glVariantbvEXT (GLuint id, GLbyte *addr)
void glVariantsvEXT (GLuint id, GLshort *addr)
void glVariantivEXT (GLuint id, GLint *addr)
@ -135,7 +135,7 @@ GL_EXT_vertex_shader
void glVariantubvEXT (GLuint id, GLubyte *addr)
void glVariantusvEXT (GLuint id, GLushort *addr)
void glVariantuivEXT (GLuint id, GLuint *addr)
void glVariantPointerEXT (GLuint id, GLenum type, GLuint stride, GLvoid *addr)
void glVariantPointerEXT (GLuint id, GLenum type, GLuint stride, void *addr)
void glEnableVariantClientStateEXT (GLuint id)
void glDisableVariantClientStateEXT (GLuint id)
GLuint glBindLightParameterEXT (GLenum light, GLenum value)
@ -147,7 +147,7 @@ GL_EXT_vertex_shader
void glGetVariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data)
void glGetVariantIntegervEXT (GLuint id, GLenum value, GLint *data)
void glGetVariantFloatvEXT (GLuint id, GLenum value, GLfloat *data)
void glGetVariantPointervEXT (GLuint id, GLenum value, GLvoid **data)
void glGetVariantPointervEXT (GLuint id, GLenum value, void **data)
void glGetInvariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data)
void glGetInvariantIntegervEXT (GLuint id, GLenum value, GLint *data)
void glGetInvariantFloatvEXT (GLuint id, GLenum value, GLfloat *data)

View File

@ -154,13 +154,13 @@ GL_NV_path_rendering
GLboolean glIsPointInFillPathNV (GLuint path, GLuint mask, GLfloat x, GLfloat y)
GLboolean glIsPointInStrokePathNV (GLuint path, GLfloat x, GLfloat y)
void glPathColorGenNV (GLenum color, GLenum genMode, GLenum colorFormat, const GLfloat* coeffs)
void glPathCommandsNV (GLuint path, GLsizei numCommands, const GLubyte* commands, GLsizei numCoords, GLenum coordType, const GLvoid*coords)
void glPathCommandsNV (GLuint path, GLsizei numCommands, const GLubyte* commands, GLsizei numCoords, GLenum coordType, const void*coords)
void glPathCoordsNV (GLuint path, GLsizei numCoords, GLenum coordType, const void* coords)
void glPathCoverDepthFuncNV (GLenum zfunc)
void glPathDashArrayNV (GLuint path, GLsizei dashCount, const GLfloat* dashArray)
void glPathFogGenNV (GLenum genMode)
void glPathGlyphRangeNV (GLuint firstPathName, GLenum fontTarget, const void* fontName, GLbitfield fontStyle, GLuint firstGlyph, GLsizei numGlyphs, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale)
void glPathGlyphsNV (GLuint firstPathName, GLenum fontTarget, const void* fontName, GLbitfield fontStyle, GLsizei numGlyphs, GLenum type, const GLvoid*charcodes, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale)
void glPathGlyphsNV (GLuint firstPathName, GLenum fontTarget, const void* fontName, GLbitfield fontStyle, GLsizei numGlyphs, GLenum type, const void*charcodes, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale)
void glPathParameterfNV (GLuint path, GLenum pname, GLfloat value)
void glPathParameterfvNV (GLuint path, GLenum pname, const GLfloat* value)
void glPathParameteriNV (GLuint path, GLenum pname, GLint value)
@ -168,7 +168,7 @@ GL_NV_path_rendering
void glPathStencilDepthOffsetNV (GLfloat factor, GLfloat units)
void glPathStencilFuncNV (GLenum func, GLint ref, GLuint mask)
void glPathStringNV (GLuint path, GLenum format, GLsizei length, const void* pathString)
void glPathSubCommandsNV (GLuint path, GLsizei commandStart, GLsizei commandsToDelete, GLsizei numCommands, const GLubyte* commands, GLsizei numCoords, GLenum coordType, const GLvoid*coords)
void glPathSubCommandsNV (GLuint path, GLsizei commandStart, GLsizei commandsToDelete, GLsizei numCommands, const GLubyte* commands, GLsizei numCoords, GLenum coordType, const void*coords)
void glPathSubCoordsNV (GLuint path, GLsizei coordStart, GLsizei numCoords, GLenum coordType, const void* coords)
void glPathTexGenNV (GLenum texCoordSet, GLenum genMode, GLint components, const GLfloat* coeffs)
GLboolean glPointAlongPathNV (GLuint path, GLsizei startSegment, GLsizei numSegments, GLfloat distance, GLfloat* x, GLfloat *y, GLfloat *tangentX, GLfloat *tangentY)

View File

@ -7,7 +7,7 @@ GL_NV_vdpau_interop
GL_WRITE_DISCARD_NV 0x88BE
void glVDPAUFiniNV (void)
void glVDPAUGetSurfaceivNV (GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei* length, GLint *values)
void glVDPAUInitNV (const void* vdpDevice, const GLvoid*getProcAddress)
void glVDPAUInitNV (const void* vdpDevice, const void*getProcAddress)
void glVDPAUIsSurfaceNV (GLvdpauSurfaceNV surface)
void glVDPAUMapSurfacesNV (GLsizei numSurfaces, const GLvdpauSurfaceNV* surfaces)
GLvdpauSurfaceNV glVDPAURegisterOutputSurfaceNV (const void* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames)

View File

@ -1,4 +1,4 @@
GL_SUN_read_video_pixels
http://wwws.sun.com/software/graphics/opengl/extensions/gl_sun_read_video_pixels.txt
GL_SUN_read_video_pixels
void glReadVideoPixelsSUN (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels)
void glReadVideoPixelsSUN (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void* pixels)

View File

@ -43,7 +43,7 @@ http://www.opengl.org/documentation/specs/version1.2/opengl1.2.1.pdf
GL_TEXTURE_BINDING_3D 0x806A
GL_MAX_ELEMENTS_VERTICES 0x80E8
GL_MAX_ELEMENTS_INDICES 0x80E9
void glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
void glTexImage3D (GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
void glTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
void glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices)
void glTexImage3D (GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels)
void glTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels)
void glCopyTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)

View File

@ -100,13 +100,13 @@ http://www.opengl.org/documentation/specs/version1.3/glspec13.pdf
void glActiveTexture (GLenum texture)
void glClientActiveTexture (GLenum texture)
void glCompressedTexImage1D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
void glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
void glCompressedTexImage3D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
void glCompressedTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
void glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
void glCompressedTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
void glGetCompressedTexImage (GLenum target, GLint lod, GLvoid *img)
void glCompressedTexImage1D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data)
void glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data)
void glCompressedTexImage3D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data)
void glCompressedTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data)
void glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data)
void glCompressedTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data)
void glGetCompressedTexImage (GLenum target, GLint lod, void *img)
void glLoadTransposeMatrixd (const GLdouble m[16])
void glLoadTransposeMatrixf (const GLfloat m[16])
void glMultTransposeMatrixd (const GLdouble m[16])

View File

@ -46,7 +46,7 @@ http://www.opengl.org/documentation/specs/version1.4/glspec14.pdf
void glFogCoordfv (const GLfloat *coord)
void glFogCoordd (GLdouble coord)
void glFogCoorddv (const GLdouble *coord)
void glFogCoordPointer (GLenum type, GLsizei stride, const GLvoid *pointer)
void glFogCoordPointer (GLenum type, GLsizei stride, const void *pointer)
void glMultiDrawArrays (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
void glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const void *const* indices, GLsizei drawcount)
void glPointParameteri (GLenum pname, GLint param)
@ -69,7 +69,7 @@ http://www.opengl.org/documentation/specs/version1.4/glspec14.pdf
void glSecondaryColor3uiv (const GLuint *v)
void glSecondaryColor3us (GLushort red, GLushort green, GLushort blue)
void glSecondaryColor3usv (const GLushort *v)
void glSecondaryColorPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
void glSecondaryColorPointer (GLint size, GLenum type, GLsizei stride, const void *pointer)
void glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
void glWindowPos2d (GLdouble x, GLdouble y)
void glWindowPos2f (GLfloat x, GLfloat y)

View File

@ -63,12 +63,12 @@ http://www.opengl.org/documentation/specs/version1.5/glspec15.pdf
void glDeleteBuffers (GLsizei n, const GLuint* buffers)
void glGenBuffers (GLsizei n, GLuint* buffers)
GLboolean glIsBuffer (GLuint buffer)
void glBufferData (GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage)
void glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data)
void glGetBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid* data)
GLvoid* glMapBuffer (GLenum target, GLenum access)
void glBufferData (GLenum target, GLsizeiptr size, const void* data, GLenum usage)
void glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const void* data)
void glGetBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, void* data)
void* glMapBuffer (GLenum target, GLenum access)
GLboolean glUnmapBuffer (GLenum target)
void glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params)
void glGetBufferPointerv (GLenum target, GLenum pname, GLvoid** params)
void glGetBufferPointerv (GLenum target, GLenum pname, void** params)
typedef ptrdiff_t GLsizeiptr
typedef ptrdiff_t GLintptr

View File

@ -115,7 +115,7 @@ http://www.opengl.org/documentation/specs/version2.0/glspec20.pdf
void glGetVertexAttribdv (GLuint, GLenum, GLdouble*)
void glGetVertexAttribfv (GLuint, GLenum, GLfloat*)
void glGetVertexAttribiv (GLuint, GLenum, GLint*)
void glGetVertexAttribPointerv (GLuint, GLenum, GLvoid**)
void glGetVertexAttribPointerv (GLuint, GLenum, void**)
GLboolean glIsProgram (GLuint program)
GLboolean glIsShader (GLuint shader)
void glLinkProgram (GLuint program)
@ -177,4 +177,4 @@ http://www.opengl.org/documentation/specs/version2.0/glspec20.pdf
void glVertexAttrib4ubv (GLuint index, const GLubyte* v)
void glVertexAttrib4uiv (GLuint index, const GLuint* v)
void glVertexAttrib4usv (GLuint index, const GLushort* v)
void glVertexAttribPointer (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* pointer)
void glVertexAttribPointer (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* pointer)

View File

@ -138,7 +138,7 @@ http://www.opengl.org/registry/doc/glspec30.20080811.pdf
void glVertexAttribI4sv (GLuint, const GLshort*)
void glVertexAttribI4ubv (GLuint, const GLubyte*)
void glVertexAttribI4usv (GLuint, const GLushort*)
void glVertexAttribIPointer (GLuint, GLint, GLenum, GLsizei, const GLvoid*)
void glVertexAttribIPointer (GLuint, GLint, GLenum, GLsizei, const void*)
void glGetVertexAttribIiv (GLuint, GLenum, GLint*)
void glGetVertexAttribIuiv (GLuint, GLenum, GLuint*)
void glGetUniformuiv (GLuint, GLint, GLuint*)

View File

@ -36,6 +36,6 @@ http://www.opengl.org/registry/doc/glspec30.20080811.pdf
GL_BUFFER_MAP_LENGTH 0x9120
GL_BUFFER_MAP_OFFSET 0x9121
void glDrawArraysInstanced (GLenum, GLint, GLsizei, GLsizei)
void glDrawElementsInstanced (GLenum, GLsizei, GLenum, const GLvoid*, GLsizei)
void glDrawElementsInstanced (GLenum, GLsizei, GLenum, const void*, GLsizei)
void glTexBuffer (GLenum, GLenum, GLuint)
void glPrimitiveRestartIndex (GLuint)

View File

@ -768,7 +768,7 @@ GLAPI void GLAPIENTRY glBindTexture (GLenum target, GLuint texture);
GLAPI void GLAPIENTRY glBitmap (GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap);
GLAPI void GLAPIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor);
GLAPI void GLAPIENTRY glCallList (GLuint list);
GLAPI void GLAPIENTRY glCallLists (GLsizei n, GLenum type, const GLvoid *lists);
GLAPI void GLAPIENTRY glCallLists (GLsizei n, GLenum type, const void *lists);
GLAPI void GLAPIENTRY glClear (GLbitfield mask);
GLAPI void GLAPIENTRY glClearAccum (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
GLAPI void GLAPIENTRY glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
@ -810,7 +810,7 @@ GLAPI void GLAPIENTRY glColor4us (GLushort red, GLushort green, GLushort blue, G
GLAPI void GLAPIENTRY glColor4usv (const GLushort *v);
GLAPI void GLAPIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
GLAPI void GLAPIENTRY glColorMaterial (GLenum face, GLenum mode);
GLAPI void GLAPIENTRY glColorPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
GLAPI void GLAPIENTRY glColorPointer (GLint size, GLenum type, GLsizei stride, const void *pointer);
GLAPI void GLAPIENTRY glCopyPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum type);
GLAPI void GLAPIENTRY glCopyTexImage1D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border);
GLAPI void GLAPIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
@ -826,10 +826,10 @@ GLAPI void GLAPIENTRY glDisable (GLenum cap);
GLAPI void GLAPIENTRY glDisableClientState (GLenum array);
GLAPI void GLAPIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count);
GLAPI void GLAPIENTRY glDrawBuffer (GLenum mode);
GLAPI void GLAPIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
GLAPI void GLAPIENTRY glDrawPixels (GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
GLAPI void GLAPIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const void *indices);
GLAPI void GLAPIENTRY glDrawPixels (GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
GLAPI void GLAPIENTRY glEdgeFlag (GLboolean flag);
GLAPI void GLAPIENTRY glEdgeFlagPointer (GLsizei stride, const GLvoid *pointer);
GLAPI void GLAPIENTRY glEdgeFlagPointer (GLsizei stride, const void *pointer);
GLAPI void GLAPIENTRY glEdgeFlagv (const GLboolean *flag);
GLAPI void GLAPIENTRY glEnable (GLenum cap);
GLAPI void GLAPIENTRY glEnableClientState (GLenum array);
@ -874,7 +874,7 @@ GLAPI void GLAPIENTRY glGetMaterialiv (GLenum face, GLenum pname, GLint *params)
GLAPI void GLAPIENTRY glGetPixelMapfv (GLenum map, GLfloat *values);
GLAPI void GLAPIENTRY glGetPixelMapuiv (GLenum map, GLuint *values);
GLAPI void GLAPIENTRY glGetPixelMapusv (GLenum map, GLushort *values);
GLAPI void GLAPIENTRY glGetPointerv (GLenum pname, GLvoid* *params);
GLAPI void GLAPIENTRY glGetPointerv (GLenum pname, void* *params);
GLAPI void GLAPIENTRY glGetPolygonStipple (GLubyte *mask);
GLAPI const GLubyte * GLAPIENTRY glGetString (GLenum name);
GLAPI void GLAPIENTRY glGetTexEnvfv (GLenum target, GLenum pname, GLfloat *params);
@ -882,14 +882,14 @@ GLAPI void GLAPIENTRY glGetTexEnviv (GLenum target, GLenum pname, GLint *params)
GLAPI void GLAPIENTRY glGetTexGendv (GLenum coord, GLenum pname, GLdouble *params);
GLAPI void GLAPIENTRY glGetTexGenfv (GLenum coord, GLenum pname, GLfloat *params);
GLAPI void GLAPIENTRY glGetTexGeniv (GLenum coord, GLenum pname, GLint *params);
GLAPI void GLAPIENTRY glGetTexImage (GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
GLAPI void GLAPIENTRY glGetTexImage (GLenum target, GLint level, GLenum format, GLenum type, void *pixels);
GLAPI void GLAPIENTRY glGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params);
GLAPI void GLAPIENTRY glGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params);
GLAPI void GLAPIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params);
GLAPI void GLAPIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint *params);
GLAPI void GLAPIENTRY glHint (GLenum target, GLenum mode);
GLAPI void GLAPIENTRY glIndexMask (GLuint mask);
GLAPI void GLAPIENTRY glIndexPointer (GLenum type, GLsizei stride, const GLvoid *pointer);
GLAPI void GLAPIENTRY glIndexPointer (GLenum type, GLsizei stride, const void *pointer);
GLAPI void GLAPIENTRY glIndexd (GLdouble c);
GLAPI void GLAPIENTRY glIndexdv (const GLdouble *c);
GLAPI void GLAPIENTRY glIndexf (GLfloat c);
@ -901,7 +901,7 @@ GLAPI void GLAPIENTRY glIndexsv (const GLshort *c);
GLAPI void GLAPIENTRY glIndexub (GLubyte c);
GLAPI void GLAPIENTRY glIndexubv (const GLubyte *c);
GLAPI void GLAPIENTRY glInitNames (void);
GLAPI void GLAPIENTRY glInterleavedArrays (GLenum format, GLsizei stride, const GLvoid *pointer);
GLAPI void GLAPIENTRY glInterleavedArrays (GLenum format, GLsizei stride, const void *pointer);
GLAPI GLboolean GLAPIENTRY glIsEnabled (GLenum cap);
GLAPI GLboolean GLAPIENTRY glIsList (GLuint list);
GLAPI GLboolean GLAPIENTRY glIsTexture (GLuint texture);
@ -947,7 +947,7 @@ GLAPI void GLAPIENTRY glNormal3i (GLint nx, GLint ny, GLint nz);
GLAPI void GLAPIENTRY glNormal3iv (const GLint *v);
GLAPI void GLAPIENTRY glNormal3s (GLshort nx, GLshort ny, GLshort nz);
GLAPI void GLAPIENTRY glNormal3sv (const GLshort *v);
GLAPI void GLAPIENTRY glNormalPointer (GLenum type, GLsizei stride, const GLvoid *pointer);
GLAPI void GLAPIENTRY glNormalPointer (GLenum type, GLsizei stride, const void *pointer);
GLAPI void GLAPIENTRY glOrtho (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
GLAPI void GLAPIENTRY glPassThrough (GLfloat token);
GLAPI void GLAPIENTRY glPixelMapfv (GLenum map, GLsizei mapsize, const GLfloat *values);
@ -996,7 +996,7 @@ GLAPI void GLAPIENTRY glRasterPos4iv (const GLint *v);
GLAPI void GLAPIENTRY glRasterPos4s (GLshort x, GLshort y, GLshort z, GLshort w);
GLAPI void GLAPIENTRY glRasterPos4sv (const GLshort *v);
GLAPI void GLAPIENTRY glReadBuffer (GLenum mode);
GLAPI void GLAPIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
GLAPI void GLAPIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels);
GLAPI void GLAPIENTRY glRectd (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
GLAPI void GLAPIENTRY glRectdv (const GLdouble *v1, const GLdouble *v2);
GLAPI void GLAPIENTRY glRectf (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2);
@ -1048,7 +1048,7 @@ GLAPI void GLAPIENTRY glTexCoord4i (GLint s, GLint t, GLint r, GLint q);
GLAPI void GLAPIENTRY glTexCoord4iv (const GLint *v);
GLAPI void GLAPIENTRY glTexCoord4s (GLshort s, GLshort t, GLshort r, GLshort q);
GLAPI void GLAPIENTRY glTexCoord4sv (const GLshort *v);
GLAPI void GLAPIENTRY glTexCoordPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
GLAPI void GLAPIENTRY glTexCoordPointer (GLint size, GLenum type, GLsizei stride, const void *pointer);
GLAPI void GLAPIENTRY glTexEnvf (GLenum target, GLenum pname, GLfloat param);
GLAPI void GLAPIENTRY glTexEnvfv (GLenum target, GLenum pname, const GLfloat *params);
GLAPI void GLAPIENTRY glTexEnvi (GLenum target, GLenum pname, GLint param);
@ -1059,14 +1059,14 @@ GLAPI void GLAPIENTRY glTexGenf (GLenum coord, GLenum pname, GLfloat param);
GLAPI void GLAPIENTRY glTexGenfv (GLenum coord, GLenum pname, const GLfloat *params);
GLAPI void GLAPIENTRY glTexGeni (GLenum coord, GLenum pname, GLint param);
GLAPI void GLAPIENTRY glTexGeniv (GLenum coord, GLenum pname, const GLint *params);
GLAPI void GLAPIENTRY glTexImage1D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
GLAPI void GLAPIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
GLAPI void GLAPIENTRY glTexImage1D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels);
GLAPI void GLAPIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
GLAPI void GLAPIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param);
GLAPI void GLAPIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat *params);
GLAPI void GLAPIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param);
GLAPI void GLAPIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint *params);
GLAPI void GLAPIENTRY glTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
GLAPI void GLAPIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
GLAPI void GLAPIENTRY glTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
GLAPI void GLAPIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
GLAPI void GLAPIENTRY glTranslated (GLdouble x, GLdouble y, GLdouble z);
GLAPI void GLAPIENTRY glTranslatef (GLfloat x, GLfloat y, GLfloat z);
GLAPI void GLAPIENTRY glVertex2d (GLdouble x, GLdouble y);
@ -1093,7 +1093,7 @@ GLAPI void GLAPIENTRY glVertex4i (GLint x, GLint y, GLint z, GLint w);
GLAPI void GLAPIENTRY glVertex4iv (const GLint *v);
GLAPI void GLAPIENTRY glVertex4s (GLshort x, GLshort y, GLshort z, GLshort w);
GLAPI void GLAPIENTRY glVertex4sv (const GLshort *v);
GLAPI void GLAPIENTRY glVertexPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
GLAPI void GLAPIENTRY glVertexPointer (GLint size, GLenum type, GLsizei stride, const void *pointer);
GLAPI void GLAPIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
#define GLEW_VERSION_1_1 GLEW_GET_VAR(__GLEW_VERSION_1_1)

View File

@ -143,7 +143,7 @@ width="88" height="32" border="0" alt="Support This Project"></a></td></tr> -->
<li>gcc compiler</li>
</ul>
Ubuntu: <pre>sudo apt-get install Xmu-dev Xi-Dev</pre>
Ubuntu: <pre>sudo apt-get install libXmu-dev libXi-dev libgl-dev dos2unix</pre>
<!-- begin footer.html -->
</td></tr></table></body>
<!-- end footer.html -->

File diff suppressed because it is too large Load Diff

View File

@ -148,18 +148,19 @@ width="88" height="32" border="0" alt="Support This Project"></a></td></tr> -->
<tr><td class="num">39</td><td>&nbsp;</td><td><a href="http://www.opengl.org/registry/specs/gl/NV/DX_interop.txt">NV_DX_interop</a></td></tr>
<tr><td class="num">40</td><td>&nbsp;</td><td><a href="http://www.opengl.org/registry/specs/gl/NV/DX_interop2.txt">NV_DX_interop2</a></td></tr>
<tr><td class="num">41</td><td>&nbsp;</td><td><a href="http://www.opengl.org/registry/specs/gl/NV/copy_image.txt">NV_copy_image</a></td></tr>
<tr><td class="num">42</td><td>&nbsp;</td><td><a href="http://www.opengl.org/registry/specs/gl/NV/float_buffer.txt">NV_float_buffer</a></td></tr>
<tr><td class="num">43</td><td>&nbsp;</td><td><a href="http://developer.download.nvidia.com/opengl/specs/WGL_nv_gpu_affinity.txt">NV_gpu_affinity</a></td></tr>
<tr><td class="num">44</td><td>&nbsp;</td><td><a href="http://www.opengl.org/registry/specs/gl/NV/multisample_coverage.txt">NV_multisample_coverage</a></td></tr>
<tr><td class="num">45</td><td>&nbsp;</td><td><a href="http://www.opengl.org/registry/specs/gl/NV/present_video.txt">NV_present_video</a></td></tr>
<tr><td class="num">46</td><td>&nbsp;</td><td><a href="http://www.opengl.org/registry/specs/gl/NV/render_depth_texture.txt">NV_render_depth_texture</a></td></tr>
<tr><td class="num">47</td><td>&nbsp;</td><td><a href="http://www.opengl.org/registry/specs/gl/NV/render_texture_rectangle.txt">NV_render_texture_rectangle</a></td></tr>
<tr><td class="num">48</td><td>&nbsp;</td><td><a href="http://www.opengl.org/registry/specs/gl/NV/wgl_swap_group.txt">NV_swap_group</a></td></tr>
<tr><td class="num">49</td><td>&nbsp;</td><td><a href="http://oss.sgi.com/projects/ogl-sample/registry/NV/vertex_array_range.txt">NV_vertex_array_range</a></td></tr>
<tr><td class="num">50</td><td>&nbsp;</td><td><a href="http://www.opengl.org/registry/specs/gl/NV/video_capture.txt">NV_video_capture</a></td></tr>
<tr><td class="num">51</td><td>&nbsp;</td><td><a href="http://www.opengl.org/registry/specs/gl/NV/wgl_video_output.txt">NV_video_output</a></td></tr>
<tr><td class="num">42</td><td>&nbsp;</td><td><a href="http://www.opengl.org/registry/specs/gl/NV/wgl_delay_before_swap.txt">NV_delay_before_swap</a></td></tr>
<tr><td class="num">43</td><td>&nbsp;</td><td><a href="http://www.opengl.org/registry/specs/gl/NV/float_buffer.txt">NV_float_buffer</a></td></tr>
<tr><td class="num">44</td><td>&nbsp;</td><td><a href="http://developer.download.nvidia.com/opengl/specs/WGL_nv_gpu_affinity.txt">NV_gpu_affinity</a></td></tr>
<tr><td class="num">45</td><td>&nbsp;</td><td><a href="http://www.opengl.org/registry/specs/gl/NV/multisample_coverage.txt">NV_multisample_coverage</a></td></tr>
<tr><td class="num">46</td><td>&nbsp;</td><td><a href="http://www.opengl.org/registry/specs/gl/NV/present_video.txt">NV_present_video</a></td></tr>
<tr><td class="num">47</td><td>&nbsp;</td><td><a href="http://www.opengl.org/registry/specs/gl/NV/render_depth_texture.txt">NV_render_depth_texture</a></td></tr>
<tr><td class="num">48</td><td>&nbsp;</td><td><a href="http://www.opengl.org/registry/specs/gl/NV/render_texture_rectangle.txt">NV_render_texture_rectangle</a></td></tr>
<tr><td class="num">49</td><td>&nbsp;</td><td><a href="http://www.opengl.org/registry/specs/gl/NV/wgl_swap_group.txt">NV_swap_group</a></td></tr>
<tr><td class="num">50</td><td>&nbsp;</td><td><a href="http://oss.sgi.com/projects/ogl-sample/registry/NV/vertex_array_range.txt">NV_vertex_array_range</a></td></tr>
<tr><td class="num">51</td><td>&nbsp;</td><td><a href="http://www.opengl.org/registry/specs/gl/NV/video_capture.txt">NV_video_capture</a></td></tr>
<tr><td class="num">52</td><td>&nbsp;</td><td><a href="http://www.opengl.org/registry/specs/gl/NV/wgl_video_output.txt">NV_video_output</a></td></tr>
<tr><td><br></td><td></td><td></td></tr>
<tr><td class="num">52</td><td>&nbsp;</td><td><a href="http://www.opengl.org/registry/specs/gl/OML/wgl_sync_control.txt">OML_sync_control</a></td></tr>
<tr><td class="num">53</td><td>&nbsp;</td><td><a href="http://www.opengl.org/registry/specs/gl/OML/wgl_sync_control.txt">OML_sync_control</a></td></tr>
</table>
<!-- begin footer.html -->
</td></tr></table></body>