diff --git a/auto/Makefile b/auto/Makefile index 113313f..e05ceef 100644 --- a/auto/Makefile +++ b/auto/Makefile @@ -209,7 +209,7 @@ $(S.DEST)/glew.c: $(EXT)/.dummy cat $(SRC)/glew_init_wgl.c >> $@ $(BIN)/make_list.pl $(WGL_EXT_SPEC) >> $@ echo -e "\n return GLEW_OK;\n}" >> $@; - echo -e "\n#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))" >> $@ + echo -e "\n#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))" >> $@ $(BIN)/make_def_fun.pl GLX $(GLX_CORE_SPEC) >> $@ $(BIN)/make_def_fun.pl GLX $(GLX_EXT_SPEC) >> $@ echo -e "\n#if !defined(GLEW_MX)" >> $@; @@ -224,7 +224,7 @@ $(S.DEST)/glew.c: $(EXT)/.dummy $(BIN)/make_list.pl $(CORE)/GLX_VERSION_1_3 | grep -v '\"GLX_VERSION' >> $@ $(BIN)/make_list.pl $(GLX_EXT_SPEC) >> $@ echo -e "\n return GLEW_OK;\n}" >> $@ - echo -e "\n#endif /* !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) */\n" >> $@; + echo -e "\n#endif /* !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) */\n" >> $@; cat $(SRC)/glew_init_tail.c >> $@ cat $(SRC)/glew_str_head.c >> $@ $(BIN)/make_str.pl $(GL_CORE_SPEC) $(GL_EXT_SPEC) >> $@ diff --git a/auto/bin/filter_gl_ext.sh b/auto/bin/filter_gl_ext.sh index 2aa58c4..b45dde0 100755 --- a/auto/bin/filter_gl_ext.sh +++ b/auto/bin/filter_gl_ext.sh @@ -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 <> $1/GL_AMD_debug_output <> $1/GL_ARB_debug_output <> $1/GL_KHR_debug <> $1/GL_EXT_direct_state_access < tmp mv tmp $1/GL_AMD_performance_monitor @@ -441,7 +443,7 @@ EOT # Probably ought to be explicitly mentioned in the spec language cat >> $1/GL_REGAL_log < GLLOGPROCREGAL diff --git a/auto/bin/parse_spec.pl b/auto/bin/parse_spec.pl index bcd4b14..7e64ddb 100755 --- a/auto/bin/parse_spec.pl +++ b/auto/bin/parse_spec.pl @@ -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} = { diff --git a/auto/core/gl/GL_APPLE_texture_range b/auto/core/gl/GL_APPLE_texture_range index 7ca9b9b..9e3a678 100644 --- a/auto/core/gl/GL_APPLE_texture_range +++ b/auto/core/gl/GL_APPLE_texture_range @@ -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) diff --git a/auto/core/gl/GL_ARB_imaging b/auto/core/gl/GL_ARB_imaging index 0efd0c1..c23a566 100644 --- a/auto/core/gl/GL_ARB_imaging +++ b/auto/core/gl/GL_ARB_imaging @@ -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) diff --git a/auto/core/gl/GL_ARB_matrix_palette b/auto/core/gl/GL_ARB_matrix_palette index 4b67c15..2e22824 100644 --- a/auto/core/gl/GL_ARB_matrix_palette +++ b/auto/core/gl/GL_ARB_matrix_palette @@ -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) diff --git a/auto/core/gl/GL_ARB_robustness b/auto/core/gl/GL_ARB_robustness index cdeeb4f..3e4f976 100644 --- a/auto/core/gl/GL_ARB_robustness +++ b/auto/core/gl/GL_ARB_robustness @@ -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) diff --git a/auto/core/gl/GL_ARB_separate_shader_objects b/auto/core/gl/GL_ARB_separate_shader_objects index b90b68a..57ec75a 100644 --- a/auto/core/gl/GL_ARB_separate_shader_objects +++ b/auto/core/gl/GL_ARB_separate_shader_objects @@ -12,7 +12,7 @@ GL_ARB_separate_shader_objects GL_ALL_SHADER_BITS 0xFFFFFFFF void glActiveShaderProgram (GLuint pipeline, GLuint program) void glBindProgramPipeline (GLuint pipeline) - GLuint glCreateShaderProgramv (GLenum type, GLsizei count, const GLchar ** strings) + GLuint glCreateShaderProgramv (GLenum type, GLsizei count, const GLchar * const * strings) void glDeleteProgramPipelines (GLsizei n, const GLuint* pipelines) void glGenProgramPipelines (GLsizei n, GLuint* pipelines) void glGetProgramPipelineInfoLog (GLuint pipeline, GLsizei bufSize, GLsizei* length, GLchar *infoLog) diff --git a/auto/core/gl/GL_ARB_vertex_blend b/auto/core/gl/GL_ARB_vertex_blend index 8da2c78..7beb75a 100644 --- a/auto/core/gl/GL_ARB_vertex_blend +++ b/auto/core/gl/GL_ARB_vertex_blend @@ -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) diff --git a/auto/core/gl/GL_ATI_map_object_buffer b/auto/core/gl/GL_ATI_map_object_buffer index 573afd2..f401aad 100644 --- a/auto/core/gl/GL_ATI_map_object_buffer +++ b/auto/core/gl/GL_ATI_map_object_buffer @@ -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) diff --git a/auto/core/gl/GL_EXT_draw_instanced b/auto/core/gl/GL_EXT_draw_instanced index afafa27..e8e5425 100644 --- a/auto/core/gl/GL_EXT_draw_instanced +++ b/auto/core/gl/GL_EXT_draw_instanced @@ -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) diff --git a/auto/core/gl/GL_EXT_draw_range_elements b/auto/core/gl/GL_EXT_draw_range_elements index 347ce62..d495fe7 100644 --- a/auto/core/gl/GL_EXT_draw_range_elements +++ b/auto/core/gl/GL_EXT_draw_range_elements @@ -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) diff --git a/auto/core/gl/GL_EXT_fog_coord b/auto/core/gl/GL_EXT_fog_coord index ac7868a..5210d54 100644 --- a/auto/core/gl/GL_EXT_fog_coord +++ b/auto/core/gl/GL_EXT_fog_coord @@ -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) diff --git a/auto/core/gl/GL_EXT_gpu_shader4 b/auto/core/gl/GL_EXT_gpu_shader4 index 0e89f0d..e6b254d 100644 --- a/auto/core/gl/GL_EXT_gpu_shader4 +++ b/auto/core/gl/GL_EXT_gpu_shader4 @@ -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) diff --git a/auto/core/gl/GL_EXT_secondary_color b/auto/core/gl/GL_EXT_secondary_color index e915455..34a2a78 100644 --- a/auto/core/gl/GL_EXT_secondary_color +++ b/auto/core/gl/GL_EXT_secondary_color @@ -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) diff --git a/auto/core/gl/GL_EXT_vertex_shader b/auto/core/gl/GL_EXT_vertex_shader index eb125b6..651fbc2 100644 --- a/auto/core/gl/GL_EXT_vertex_shader +++ b/auto/core/gl/GL_EXT_vertex_shader @@ -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) diff --git a/auto/core/gl/GL_NV_path_rendering b/auto/core/gl/GL_NV_path_rendering index 42e1336..e884288 100644 --- a/auto/core/gl/GL_NV_path_rendering +++ b/auto/core/gl/GL_NV_path_rendering @@ -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) diff --git a/auto/core/gl/GL_NV_vdpau_interop b/auto/core/gl/GL_NV_vdpau_interop index a2b68b2..12251ad 100644 --- a/auto/core/gl/GL_NV_vdpau_interop +++ b/auto/core/gl/GL_NV_vdpau_interop @@ -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) diff --git a/auto/core/gl/GL_SUN_read_video_pixels b/auto/core/gl/GL_SUN_read_video_pixels index faa55f9..1de7cc8 100644 --- a/auto/core/gl/GL_SUN_read_video_pixels +++ b/auto/core/gl/GL_SUN_read_video_pixels @@ -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) diff --git a/auto/core/gl/GL_VERSION_1_2 b/auto/core/gl/GL_VERSION_1_2 index 977fec0..f868670 100644 --- a/auto/core/gl/GL_VERSION_1_2 +++ b/auto/core/gl/GL_VERSION_1_2 @@ -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) diff --git a/auto/core/gl/GL_VERSION_1_3 b/auto/core/gl/GL_VERSION_1_3 index 737ad7c..0c531d4 100644 --- a/auto/core/gl/GL_VERSION_1_3 +++ b/auto/core/gl/GL_VERSION_1_3 @@ -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]) diff --git a/auto/core/gl/GL_VERSION_1_4 b/auto/core/gl/GL_VERSION_1_4 index ed5b4e8..2c9ba46 100644 --- a/auto/core/gl/GL_VERSION_1_4 +++ b/auto/core/gl/GL_VERSION_1_4 @@ -46,9 +46,9 @@ 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 GLvoid **indices, GLsizei drawcount) + void glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const void *const* indices, GLsizei drawcount) void glPointParameteri (GLenum pname, GLint param) void glPointParameteriv (GLenum pname, const GLint *params) void glPointParameterf (GLenum pname, GLfloat 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) diff --git a/auto/core/gl/GL_VERSION_1_5 b/auto/core/gl/GL_VERSION_1_5 index d1ec8d4..ad53e9f 100644 --- a/auto/core/gl/GL_VERSION_1_5 +++ b/auto/core/gl/GL_VERSION_1_5 @@ -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 diff --git a/auto/core/gl/GL_VERSION_2_0 b/auto/core/gl/GL_VERSION_2_0 index 2b65bd8..b23d1a2 100644 --- a/auto/core/gl/GL_VERSION_2_0 +++ b/auto/core/gl/GL_VERSION_2_0 @@ -108,14 +108,14 @@ http://www.opengl.org/documentation/specs/version2.0/glspec20.pdf void glGetProgramInfoLog (GLuint program, GLsizei bufSize, GLsizei* length, GLchar* infoLog) void glGetShaderiv (GLuint shader, GLenum pname, GLint* param) void glGetShaderInfoLog (GLuint shader, GLsizei bufSize, GLsizei* length, GLchar* infoLog) - void glShaderSource (GLuint shader, GLsizei count, const GLchar** strings, const GLint* lengths) + void glShaderSource (GLuint shader, GLsizei count, const GLchar *const* string, const GLint* length) GLint glGetUniformLocation (GLuint program, const GLchar* name) void glGetUniformfv (GLuint program, GLint location, GLfloat* params) void glGetUniformiv (GLuint program, GLint location, GLint* params) 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) diff --git a/auto/core/gl/GL_VERSION_3_0 b/auto/core/gl/GL_VERSION_3_0 index 747eb83..44f9158 100644 --- a/auto/core/gl/GL_VERSION_3_0 +++ b/auto/core/gl/GL_VERSION_3_0 @@ -113,7 +113,7 @@ http://www.opengl.org/registry/doc/glspec30.20080811.pdf GLboolean glIsEnabledi (GLenum, GLuint) void glBeginTransformFeedback (GLenum) void glEndTransformFeedback (void) - void glTransformFeedbackVaryings (GLuint, GLsizei, const GLchar **, GLenum) + void glTransformFeedbackVaryings (GLuint, GLsizei, const GLchar *const*, GLenum) void glGetTransformFeedbackVarying (GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *) void glClampColor (GLenum, GLenum) void glBeginConditionalRender (GLuint, GLenum) @@ -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*) diff --git a/auto/core/gl/GL_VERSION_3_1 b/auto/core/gl/GL_VERSION_3_1 index 3e387a3..cf8f22b 100644 --- a/auto/core/gl/GL_VERSION_3_1 +++ b/auto/core/gl/GL_VERSION_3_1 @@ -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) diff --git a/auto/doc/build.html b/auto/doc/build.html index ef06a85..03aae75 100644 --- a/auto/doc/build.html +++ b/auto/doc/build.html @@ -44,4 +44,5 @@
  • gcc compiler
    • -Ubuntu: 
    sudo apt-get install Xmu-dev Xi-Dev
    +Ubuntu: 
    sudo apt-get install libXmu-dev libXi-dev libgl-dev dos2unix
    +Fedora: 
    sudo yum install libXmu-devel libXi-devel libGL-devel dos2unix
    diff --git a/auto/doc/index.html b/auto/doc/index.html index 1650bec..349bb0b 100644 --- a/auto/doc/index.html +++ b/auto/doc/index.html @@ -60,8 +60,9 @@ An up-to-date copy is also available using git Unsupported snapshots are also available:

    Supported Extensions

    diff --git a/auto/src/glew.rc b/auto/src/glew.rc index 5674cc9..c5afe1c 100644 --- a/auto/src/glew.rc +++ b/auto/src/glew.rc @@ -56,7 +56,81 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "Comments", "The OpenGL Extension Wrangler Library\r\nCopyright (C) 2002-2008, Milan Ikits \r\nCopyright (C) 2002-2008, Marcelo E. Magallon \r\nCopyright (C) 2002, Lev Povalahev\r\nAll rights reserved.\r\n\r\nRedistribution and use in source and binary forms, with or without \r\nmodification, are permitted provided that the following conditions are met:\r\n\r\n* Redistributions of source code must retain the above copyright notice, \r\n this list of conditions and the following disclaimer.\r\n* Redistributions in binary form must reproduce the above copyright notice, \r\n this list of conditions and the following disclaimer in the documentation \r\n and/or other materials provided with the distribution.\r\n* The name of the author may be used to endorse or promote products \r\n derived from this software without specific prior written permission.\r\n\r\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ''AS IS'' \r\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE \r\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\r\nARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE \r\nLIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR \r\nCONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF \r\nSUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\r\nINTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN\r\nCONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\r\nARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF\r\nTHE POSSIBILITY OF SUCH DAMAGE.\r\n\r\n\r\nMesa 3-D graphics library\r\n\r\nVersion: 7.0\r\n\r\nCopyright (C) 1999-2007 Brian Paul All Rights Reserved.\r\n\r\nPermission is hereby granted, free of charge, to any person obtaining a\r\ncopy of this software and associated documentation files (the ''Software''),\r\nto deal in the Software without restriction, including without limitation\r\nthe rights to use, copy, modify, merge, publish, distribute, sublicense,\r\nand/or sell copies of the Software, and to permit persons to whom the\r\nSoftware is furnished to do so, subject to the following conditions:\r\n\r\nThe above copyright notice and this permission notice shall be included\r\nin all copies or substantial portions of the Software.\r\n\r\nTHE SOFTWARE IS PROVIDED ''AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS\r\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL\r\nBRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN\r\nAN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r\nCONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r\n\r\n\r\nCopyright (c) 2007 The Khronos Group Inc.\r\n\r\nPermission is hereby granted, free of charge, to any person obtaining a\r\ncopy of this software and/or associated documentation files (the\r\n''Materials''), to deal in the Materials without restriction, including\r\nwithout limitation the rights to use, copy, modify, merge, publish,\r\ndistribute, sublicense, and/or sell copies of the Materials, and to\r\npermit persons to whom the Materials are furnished to do so, subject to\r\nthe following conditions:\r\n\r\nThe above copyright notice and this permission notice shall be included\r\nin all copies or substantial portions of the Materials.\r\n\r\nTHE MATERIALS ARE PROVIDED ''AS IS'', WITHOUT WARRANTY OF ANY KIND,\r\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\r\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\r\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\r\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\r\nMATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.\0" + VALUE "Comments", + "The OpenGL Extension Wrangler Library\r\n" + "Copyright (C) 2002-2008, Milan Ikits \r\n" + "Copyright (C) 2002-2008, Marcelo E. Magallon \r\n" + "Copyright (C) 2002, Lev Povalahev\r\n" + "All rights reserved.\r\n" + "\r\n" + "Redistribution and use in source and binary forms, with or without \r\n" + "modification, are permitted provided that the following conditions are met:\r\n" + "\r\n" + "* Redistributions of source code must retain the above copyright notice, \r\n" + " this list of conditions and the following disclaimer.\r\n" + "* Redistributions in binary form must reproduce the above copyright notice, \r\n" + " this list of conditions and the following disclaimer in the documentation \r\n" + " and/or other materials provided with the distribution.\r\n" + "* The name of the author may be used to endorse or promote products \r\n" + " derived from this software without specific prior written permission.\r\n" + "\r\n" + "THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ''AS IS'' \r\n" + "AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE \r\n" + "IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\r\n" + "ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE \r\n" + "LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR \r\n" + "CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF \r\n" + "SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\r\n" + "INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN\r\n" + "CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\r\n" + "ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF\r\n" + "THE POSSIBILITY OF SUCH DAMAGE.\r\n" + "\r\n" + "\r\n" + "Mesa 3-D graphics library\r\n" + "\r\n" + "Version: 7.0\r\n" + "\r\n" + "Copyright (C) 1999-2007 Brian Paul All Rights Reserved.\r\n" + "\r\n" + "Permission is hereby granted, free of charge, to any person obtaining a\r\n" + "copy of this software and associated documentation files (the ''Software''),\r\n" + "to deal in the Software without restriction, including without limitation\r\n" + "the rights to use, copy, modify, merge, publish, distribute, sublicense,\r\n" + "and/or sell copies of the Software, and to permit persons to whom the\r\n" + "Software is furnished to do so, subject to the following conditions:\r\n" + "\r\n" + "The above copyright notice and this permission notice shall be included\r\n" + "in all copies or substantial portions of the Software.\r\n" + "\r\n" + "THE SOFTWARE IS PROVIDED ''AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS\r\n" + "OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r\n" + "FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL\r\n" + "BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN\r\n" + "AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r\n" + "CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r\n" + "\r\n" + "\r\n" + "Copyright (c) 2007 The Khronos Group Inc.\r\n" + "\r\n" + "Permission is hereby granted, free of charge, to any person obtaining a\r\n" + "copy of this software and/or associated documentation files (the\r\n" + "''Materials''), to deal in the Materials without restriction, including\r\n" + "without limitation the rights to use, copy, modify, merge, publish,\r\n" + "distribute, sublicense, and/or sell copies of the Materials, and to\r\n" + "permit persons to whom the Materials are furnished to do so, subject to\r\n" + "the following conditions:\r\n" + "\r\n" + "The above copyright notice and this permission notice shall be included\r\n" + "in all copies or substantial portions of the Materials.\r\n" + "\r\n" + "THE MATERIALS ARE PROVIDED ''AS IS'', WITHOUT WARRANTY OF ANY KIND,\r\n" + "EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r\n" + "MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\r\n" + "IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\r\n" + "CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\r\n" + "TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\r\n" + "MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.\0" VALUE "CompanyName", "\0" VALUE "FileDescription", "The OpenGL Extension Wrangler Library\0" VALUE "FileVersion", "GLEW_MAJOR,GLEW_MINOR,GLEW_MICRO,0\0" diff --git a/auto/src/glew_head.c b/auto/src/glew_head.c index 252d55a..1024a42 100644 --- a/auto/src/glew_head.c +++ b/auto/src/glew_head.c @@ -2,7 +2,7 @@ #if defined(_WIN32) # include -#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) +#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) # include #endif @@ -35,7 +35,23 @@ # define GLXEW_CONTEXT_ARG_DEF_LIST void #endif /* GLEW_MX */ -#if defined(__sgi) || defined (__sun) || defined(GLEW_APPLE_GLX) +#if defined(GLEW_REGAL) + +/* In GLEW_REGAL mode we call direcly into the linked + libRegal.so glGetProcAddressREGAL for looking up + the GL function pointers. */ + +# undef glGetProcAddressREGAL +# ifdef WIN32 +extern void * __stdcall glGetProcAddressREGAL(const GLchar *name); +static void * (__stdcall * regalGetProcAddress) (const GLchar *) = glGetProcAddressREGAL; +# else +extern void * glGetProcAddressREGAL(const GLchar *name); +static void * (*regalGetProcAddress) (const GLchar *) = glGetProcAddressREGAL; +# endif +# define glGetProcAddressREGAL GLEW_GET_FUN(__glewGetProcAddressREGAL) + +#elif defined(__sgi) || defined (__sun) || defined(__HAIKU__) || defined(GLEW_APPLE_GLX) #include #include #include @@ -73,11 +89,7 @@ void* NSGLGetProcAddress (const GLubyte *name) void* addr; if (NULL == image) { -#ifdef GLEW_REGAL - image = dlopen("libRegal.dylib", RTLD_LAZY); -#else image = dlopen("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL", RTLD_LAZY); -#endif } if( !image ) return NULL; addr = dlsym(image, (const char*)name); @@ -99,11 +111,7 @@ void* NSGLGetProcAddress (const GLubyte *name) char* symbolName; if (NULL == image) { -#ifdef GLEW_REGAL - image = NSAddImage("libRegal.dylib", NSADDIMAGE_OPTION_RETURN_ON_ERROR); -#else image = NSAddImage("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL", NSADDIMAGE_OPTION_RETURN_ON_ERROR); -#endif } /* prepend a '_' for the Unix C symbol mangling convention */ symbolName = malloc(strlen((const char*)name) + 2); @@ -127,11 +135,13 @@ void* NSGLGetProcAddress (const GLubyte *name) /* * Define glewGetProcAddress. */ -#if defined(_WIN32) +#if defined(GLEW_REGAL) +# define glewGetProcAddress(name) regalGetProcAddress((const GLchar *) name) +#elif defined(_WIN32) # define glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name) #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX) # define glewGetProcAddress(name) NSGLGetProcAddress(name) -#elif defined(__sgi) || defined(__sun) +#elif defined(__sgi) || defined(__sun) || defined(__HAIKU__) # define glewGetProcAddress(name) dlGetProcAddress(name) #elif defined(__ANDROID__) # define glewGetProcAddress(name) NULL /* TODO */ diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h index c13491f..15ced10 100644 --- a/auto/src/glew_head.h +++ b/auto/src/glew_head.h @@ -38,13 +38,24 @@ * GL needs GLAPI and GLAPIENTRY, GLU needs APIENTRY, CALLBACK, and wchar_t * defined properly. */ -/* */ -#ifndef APIENTRY +/* and */ +#ifdef APIENTRY +# ifndef GLAPIENTRY +# define GLAPIENTRY APIENTRY +# endif +# ifndef GLEWAPIENTRY +# define GLEWAPIENTRY APIENTRY +# endif +#else #define GLEW_APIENTRY_DEFINED -# if defined(__MINGW32__) || defined(__CYGWIN__) -# define APIENTRY __stdcall -# elif (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC__) +# if defined(__MINGW32__) || defined(__CYGWIN__) || (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC__) # define APIENTRY __stdcall +# ifndef GLAPIENTRY +# define GLAPIENTRY __stdcall +# endif +# ifndef GLEWAPIENTRY +# define GLEWAPIENTRY __stdcall +# endif # else # define APIENTRY # endif @@ -101,14 +112,6 @@ typedef _W64 int ptrdiff_t; # endif #endif -#ifndef GLAPIENTRY -#define GLAPIENTRY APIENTRY -#endif - -#ifndef GLEWAPIENTRY -#define GLEWAPIENTRY APIENTRY -#endif - /* * GLEW_STATIC is defined for static library. * GLEW_BUILD is defined for building the DLL library. @@ -170,6 +173,8 @@ typedef _W64 int ptrdiff_t; #define GLAPI extern #endif +#endif /* _WIN32 */ + #ifndef GLAPIENTRY #define GLAPIENTRY #endif @@ -178,8 +183,6 @@ typedef _W64 int ptrdiff_t; #define GLEWAPIENTRY #endif -#endif /* _WIN32 */ - /* GLEW depends on extension string entry points for internal purposes */ #ifdef GLEW_SUBSET @@ -785,7 +788,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); @@ -827,7 +830,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); @@ -843,10 +846,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); @@ -891,7 +894,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); @@ -899,14 +902,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); @@ -918,7 +921,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); @@ -964,7 +967,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); @@ -1013,7 +1016,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); @@ -1065,7 +1068,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); @@ -1076,14 +1079,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); @@ -1110,7 +1113,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) diff --git a/auto/src/glew_init_tail.c b/auto/src/glew_init_tail.c index 2316fb3..31c1bac 100644 --- a/auto/src/glew_init_tail.c +++ b/auto/src/glew_init_tail.c @@ -36,7 +36,7 @@ GLboolean glewExperimental = GL_FALSE; #if defined(_WIN32) extern GLenum GLEWAPIENTRY wglewContextInit (void); -#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) +#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) extern GLenum GLEWAPIENTRY glxewContextInit (void); #endif /* _WIN32 */ @@ -47,7 +47,7 @@ GLenum GLEWAPIENTRY glewInit (void) if ( r != 0 ) return r; #if defined(_WIN32) return wglewContextInit(); -#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) /* _UNIX */ +#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) /* _UNIX */ return glxewContextInit(); #else return r; diff --git a/auto/src/glew_license.h b/auto/src/glew_license.h index 5c3e781..6fab64b 100644 --- a/auto/src/glew_license.h +++ b/auto/src/glew_license.h @@ -1,5 +1,6 @@ /* ** The OpenGL Extension Wrangler Library +** Copyright (C) 2008-2013, Nigel Stewart ** Copyright (C) 2002-2008, Milan Ikits ** Copyright (C) 2002-2008, Marcelo E. Magallon ** Copyright (C) 2002, Lev Povalahev diff --git a/auto/src/glew_str_glx.c b/auto/src/glew_str_glx.c index f6ddc6c..1db8d3a 100644 --- a/auto/src/glew_str_glx.c +++ b/auto/src/glew_str_glx.c @@ -4,7 +4,7 @@ return ret; } -#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX) +#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX) #if defined(GLEW_MX) GLboolean glxewContextIsSupported (const GLXEWContext* ctx, const char* name) diff --git a/auto/src/glew_tail.h b/auto/src/glew_tail.h index 54023e3..bd9be0a 100644 --- a/auto/src/glew_tail.h +++ b/auto/src/glew_tail.h @@ -54,8 +54,6 @@ GLEWAPI const GLubyte * GLEWAPIENTRY glewGetString (GLenum name); #ifdef GLEW_APIENTRY_DEFINED #undef GLEW_APIENTRY_DEFINED #undef APIENTRY -#undef GLAPIENTRY -#define GLAPIENTRY #endif #ifdef GLEW_CALLBACK_DEFINED diff --git a/auto/src/glew_utils.c b/auto/src/glew_utils.c index a7748df..9e791f4 100644 --- a/auto/src/glew_utils.c +++ b/auto/src/glew_utils.c @@ -32,7 +32,7 @@ #include #if defined(_WIN32) # include -#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) +#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) # include #endif diff --git a/auto/src/glewinfo_head.c b/auto/src/glewinfo_head.c index 95a36a7..b10f85a 100644 --- a/auto/src/glewinfo_head.c +++ b/auto/src/glewinfo_head.c @@ -4,7 +4,7 @@ #include #if defined(_WIN32) #include -#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) +#elif !defined(__APPLE__) && !defined(__HAIKU__) || defined(GLEW_APPLE_GLX) #include #endif @@ -20,7 +20,7 @@ GLEWContext _glewctx; #ifdef _WIN32 WGLEWContext _wglewctx; #define wglewGetContext() (&_wglewctx) -#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) +#elif !defined(__APPLE__) && !defined(__HAIKU__) || defined(GLEW_APPLE_GLX) GLXEWContext _glxewctx; #define glxewGetContext() (&_glxewctx) #endif @@ -28,7 +28,7 @@ GLXEWContext _glxewctx; #if defined(_WIN32) GLboolean glewCreateContext (int* pixelformat); -#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) +#elif !defined(__APPLE__) && !defined(__HAIKU__) || defined(GLEW_APPLE_GLX) GLboolean glewCreateContext (const char* display, int* visual); #else GLboolean glewCreateContext (); diff --git a/auto/src/glewinfo_tail.c b/auto/src/glewinfo_tail.c index 4fe17ae..a2b184a 100644 --- a/auto/src/glewinfo_tail.c +++ b/auto/src/glewinfo_tail.c @@ -58,7 +58,12 @@ int main (void) return 1; } #if defined(_WIN32) +#if defined(_MSC_VER) && (_MSC_VER >= 1400) + if (fopen_s(&f, "glewinfo.txt", "w") != 0) + f = stdout; +#else f = fopen("glewinfo.txt", "w"); +#endif if (f == NULL) f = stdout; #else f = stdout; @@ -202,7 +207,7 @@ GLboolean glewCreateContext () if (GL_FALSE == aglSetCurrentContext(ctx)) return GL_TRUE; /* Needed for Regal on the Mac */ #if defined(GLEW_REGAL) && defined(__APPLE__) - RegalMakeCurrent(octx); + RegalMakeCurrent(ctx); #endif return GL_FALSE; } @@ -215,6 +220,21 @@ void glewDestroyContext () /* ------------------------------------------------------------------------ */ +#elif defined(__HAIKU__) + +GLboolean glewCreateContext () +{ + /* TODO: Haiku: We need to call C++ code here */ + return GL_FALSE; +} + +void glewDestroyContext () +{ + /* TODO: Haiku: We need to call C++ code here */ +} + +/* ------------------------------------------------------------------------ */ + #else /* __UNIX || (__APPLE__ && GLEW_APPLE_GLX) */ Display* dpy = NULL; diff --git a/config/Makefile.cygwin b/config/Makefile.cygwin index b044273..8600fd0 100644 --- a/config/Makefile.cygwin +++ b/config/Makefile.cygwin @@ -6,7 +6,7 @@ LD := cc LN := LDFLAGS.EXTRA = LIBDIR = $(GLEW_DEST)/lib -LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 +LDFLAGS.GL = -lGL -lX11 LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic WARN = -Wall -W diff --git a/config/Makefile.darwin b/config/Makefile.darwin index 0c05ed1..bf34a0e 100644 --- a/config/Makefile.darwin +++ b/config/Makefile.darwin @@ -6,7 +6,7 @@ CFLAGS.EXTRA = -dynamic -fno-common LDFLAGS.EXTRA = ifneq (undefined, $(origin GLEW_APPLE_GLX)) CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX' -LDFLAGS.GL = -L/usr/X11R6/lib -lXmu -lXi -lGL -lXext -lX11 +LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11 else LDFLAGS.GL = -framework AGL -framework OpenGL endif diff --git a/config/Makefile.darwin-ppc b/config/Makefile.darwin-ppc index 2aaf66a..46c8b73 100644 --- a/config/Makefile.darwin-ppc +++ b/config/Makefile.darwin-ppc @@ -6,7 +6,7 @@ CFLAGS.EXTRA = -arch ppc -dynamic -fno-common LDFLAGS.EXTRA = -arch ppc ifneq (undefined, $(origin GLEW_APPLE_GLX)) CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX' -LDFLAGS.GL = -L/usr/X11R6/lib -lXmu -lXi -lGL -lXext -lX11 +LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11 else LDFLAGS.GL = -framework AGL -framework OpenGL endif diff --git a/config/Makefile.darwin-x86_64 b/config/Makefile.darwin-x86_64 index 83e5c47..e6eb050 100644 --- a/config/Makefile.darwin-x86_64 +++ b/config/Makefile.darwin-x86_64 @@ -6,7 +6,7 @@ CFLAGS.EXTRA = -arch x86_64 -dynamic -fno-common LDFLAGS.EXTRA = -arch x86_64 ifneq (undefined, $(origin GLEW_APPLE_GLX)) CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX' -LDFLAGS.GL = -L/usr/X11R6/lib -lXmu -lXi -lGL -lXext -lX11 +LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11 else LDFLAGS.GL = -framework AGL -framework OpenGL endif diff --git a/config/Makefile.freebsd b/config/Makefile.freebsd index ab9d9d9..bb66fcc 100644 --- a/config/Makefile.freebsd +++ b/config/Makefile.freebsd @@ -2,7 +2,7 @@ NAME = $(GLEW_NAME) CC = cc LD = ld LDFLAGS.EXTRA = -L/usr/X11R6/lib -LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 +LDFLAGS.GL = -lGL -lX11 LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic CFLAGS.EXTRA += -I/usr/X11R6/include diff --git a/config/Makefile.gnu b/config/Makefile.gnu index 2398ab0..b7c58be 100644 --- a/config/Makefile.gnu +++ b/config/Makefile.gnu @@ -2,7 +2,7 @@ NAME = $(GLEW_NAME) CC = cc LD = cc LDFLAGS.EXTRA = -L/usr/X11R6/lib -LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 +LDFLAGS.GL = -lGL -lX11 LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic NAME = GLEW diff --git a/config/Makefile.haiku b/config/Makefile.haiku new file mode 100644 index 0000000..ce832f9 --- /dev/null +++ b/config/Makefile.haiku @@ -0,0 +1,29 @@ +NAME = $(GLEW_NAME) +CC = cc +LD = cc +ifneq (undefined, $(origin GLEW_MX)) + CFLAGS.EXTRA = -DGLEW_MX +endif + +LDFLAGS.GL = -lGL +LDFLAGS.STATIC = -Wl,-Bstatic +LDFLAGS.DYNAMIC = -Wl,-Bdynamic + +NAME = GLEW +WARN = -Wall -W +POPT = -O2 + +BIN.SUFFIX = + +LIB.SONAME = lib$(NAME).so.$(SO_MAJOR) +LIB.DEVLNK = lib$(NAME).so +LIB.SHARED = lib$(NAME).so.$(SO_VERSION) +LIB.STATIC = lib$(NAME).a +LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME) + +LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) +LIB.DEVLNK.MX = lib$(NAME)mx.so +LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) +LIB.STATIC.MX = lib$(NAME)mx.a +LDFLAGS.SO.MX = -shared -Wl,-soname=$(LIB.SONAME.MX) + diff --git a/config/Makefile.kfreebsd b/config/Makefile.kfreebsd index 9501091..faf1046 100644 --- a/config/Makefile.kfreebsd +++ b/config/Makefile.kfreebsd @@ -2,7 +2,7 @@ NAME = $(GLEW_NAME) CC = cc LD = cc LDFLAGS.EXTRA = -L/usr/X11R6/lib -LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 +LDFLAGS.GL = -lGL -lX11 LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic NAME = GLEW diff --git a/config/Makefile.linux b/config/Makefile.linux index 234adc6..b460b4b 100644 --- a/config/Makefile.linux +++ b/config/Makefile.linux @@ -16,7 +16,7 @@ else LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib LIBDIR = $(GLEW_DEST)/lib endif -LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 +LDFLAGS.GL = -lGL -lX11 LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic NAME = GLEW diff --git a/config/Makefile.netbsd b/config/Makefile.netbsd index 5f69cd6..6da47b1 100644 --- a/config/Makefile.netbsd +++ b/config/Makefile.netbsd @@ -2,7 +2,7 @@ NAME = $(GLEW_NAME) CC = cc LD = ld LDFLAGS.EXTRA = -L/usr/X11R7/lib -R /usr/X11R7/lib -LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 +LDFLAGS.GL = -lGL -lX11 LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic CFLAGS.EXTRA += -I/usr/X11R7/include -fPIC diff --git a/config/Makefile.openbsd b/config/Makefile.openbsd index 365ea9e..ade993e 100644 --- a/config/Makefile.openbsd +++ b/config/Makefile.openbsd @@ -2,7 +2,7 @@ NAME = $(GLEW_NAME) CC = cc LD = ld LDFLAGS.EXTRA = -L/usr/X11R6/lib -LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11 -lm +LDFLAGS.GL = -lGLU -lGL -lX11 -lm LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic CFLAGS.EXTRA += -I/usr/X11R6/include diff --git a/config/Makefile.solaris b/config/Makefile.solaris index befba5a..fe78ca1 100644 --- a/config/Makefile.solaris +++ b/config/Makefile.solaris @@ -4,7 +4,7 @@ LD = ld CFLAGS.EXTRA = -I/usr/openwin/include LDFLAGS.SO = -G LDFLAGS.EXTRA = -L/usr/openwin/lib -LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 +LDFLAGS.GL = -lGL -lX11 NAME = GLEW BIN.SUFFIX = POPT = -xO2 diff --git a/config/Makefile.solaris-gcc b/config/Makefile.solaris-gcc index c0373f4..e00a95b 100644 --- a/config/Makefile.solaris-gcc +++ b/config/Makefile.solaris-gcc @@ -4,7 +4,7 @@ LD = ld CFLAGS.EXTRA = -I/usr/openwin/include LDFLAGS.SO = -G LDFLAGS.EXTRA = -L/usr/openwin/lib -LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 +LDFLAGS.GL = -lGL -lX11 NAME = GLEW BIN.SUFFIX = POPT = -O2 diff --git a/doc/build.html b/doc/build.html index 7e31e94..738a97e 100644 --- a/doc/build.html +++ b/doc/build.html @@ -143,7 +143,8 @@ width="88" height="32" border="0" alt="Support This Project"> -->
  • gcc compiler
    • -Ubuntu: 
    sudo apt-get install Xmu-dev Xi-Dev
    +Ubuntu: 
    sudo apt-get install libXmu-dev libXi-dev libgl-dev dos2unix
    +Fedora: 
    sudo yum install libXmu-devel libXi-devel libGL-devel dos2unix
    diff --git a/doc/glew.html b/doc/glew.html index 4800bbf..66a6507 100644 --- a/doc/glew.html +++ b/doc/glew.html @@ -112,522 +112,531 @@ width="88" height="32" border="0" alt="Support This Project"> --> 9 AMD_interleaved_elements 10 AMD_multi_draw_indirect 11 AMD_name_gen_delete -12 AMD_performance_monitor -13 AMD_pinned_memory -14 AMD_query_buffer_object -15 AMD_sample_positions -16 AMD_seamless_cubemap_per_texture -17 AMD_shader_stencil_export -18 AMD_shader_trinary_minmax -19 AMD_sparse_texture -20 AMD_stencil_operation_extended -21 AMD_texture_texture4 -22 AMD_transform_feedback3_lines_triangles -23 AMD_vertex_shader_layer -24 AMD_vertex_shader_tessellator -25 AMD_vertex_shader_viewport_index +12 AMD_occlusion_query_event +13 AMD_performance_monitor +14 AMD_pinned_memory +15 AMD_query_buffer_object +16 AMD_sample_positions +17 AMD_seamless_cubemap_per_texture +18 AMD_shader_atomic_counter_ops +19 AMD_shader_stencil_export +20 AMD_shader_stencil_value_export +21 AMD_shader_trinary_minmax +22 AMD_sparse_texture +23 AMD_stencil_operation_extended +24 AMD_texture_texture4 +25 AMD_transform_feedback3_lines_triangles +26 AMD_vertex_shader_layer +27 AMD_vertex_shader_tessellator +28 AMD_vertex_shader_viewport_index
    -26 ANGLE_depth_texture -27 ANGLE_framebuffer_blit -28 ANGLE_framebuffer_multisample -29 ANGLE_instanced_arrays -30 ANGLE_pack_reverse_row_order -31 ANGLE_program_binary -32 ANGLE_texture_compression_dxt1 -33 ANGLE_texture_compression_dxt3 -34 ANGLE_texture_compression_dxt5 -35 ANGLE_texture_usage -36 ANGLE_timer_query -37 ANGLE_translated_shader_source +29 ANGLE_depth_texture +30 ANGLE_framebuffer_blit +31 ANGLE_framebuffer_multisample +32 ANGLE_instanced_arrays +33 ANGLE_pack_reverse_row_order +34 ANGLE_program_binary +35 ANGLE_texture_compression_dxt1 +36 ANGLE_texture_compression_dxt3 +37 ANGLE_texture_compression_dxt5 +38 ANGLE_texture_usage +39 ANGLE_timer_query +40 ANGLE_translated_shader_source
    -38 APPLE_aux_depth_stencil -39 APPLE_client_storage -40 APPLE_element_array -41 APPLE_fence -42 APPLE_float_pixels -43 APPLE_flush_buffer_range -44 APPLE_object_purgeable -45 APPLE_pixel_buffer -46 APPLE_rgb_422 -47 APPLE_row_bytes -48 APPLE_specular_vector -49 APPLE_texture_range -50 APPLE_transform_hint -51 APPLE_vertex_array_object -52 APPLE_vertex_array_range -53 APPLE_vertex_program_evaluators -54 APPLE_ycbcr_422 +41 APPLE_aux_depth_stencil +42 APPLE_client_storage +43 APPLE_element_array +44 APPLE_fence +45 APPLE_float_pixels +46 APPLE_flush_buffer_range +47 APPLE_object_purgeable +48 APPLE_pixel_buffer +49 APPLE_rgb_422 +50 APPLE_row_bytes +51 APPLE_specular_vector +52 APPLE_texture_range +53 APPLE_transform_hint +54 APPLE_vertex_array_object +55 APPLE_vertex_array_range +56 APPLE_vertex_program_evaluators +57 APPLE_ycbcr_422
    -55 ARB_ES2_compatibility -56 ARB_ES3_compatibility -57 ARB_arrays_of_arrays -58 ARB_base_instance -59 ARB_bindless_texture -60 ARB_blend_func_extended -61 ARB_buffer_storage -62 ARB_cl_event -63 ARB_clear_buffer_object -64 ARB_clear_texture -65 ARB_color_buffer_float -66 ARB_compatibility -67 ARB_compressed_texture_pixel_storage -68 ARB_compute_shader -69 ARB_compute_variable_group_size -70 ARB_conservative_depth -71 ARB_copy_buffer -72 ARB_copy_image -73 ARB_debug_output -74 ARB_depth_buffer_float -75 ARB_depth_clamp -76 ARB_depth_texture -77 ARB_draw_buffers -78 ARB_draw_buffers_blend -79 ARB_draw_elements_base_vertex -80 ARB_draw_indirect -81 ARB_draw_instanced -82 ARB_enhanced_layouts -83 ARB_explicit_attrib_location -84 ARB_explicit_uniform_location -85 ARB_fragment_coord_conventions -86 ARB_fragment_layer_viewport -87 ARB_fragment_program -88 ARB_fragment_program_shadow -89 ARB_fragment_shader -90 ARB_framebuffer_no_attachments -91 ARB_framebuffer_object -92 ARB_framebuffer_sRGB -93 ARB_geometry_shader4 -94 ARB_get_program_binary -95 ARB_gpu_shader5 -96 ARB_gpu_shader_fp64 -97 ARB_half_float_pixel -98 ARB_half_float_vertex -99 ARB_imaging -100 ARB_indirect_parameters -101 ARB_instanced_arrays -102 ARB_internalformat_query -103 ARB_internalformat_query2 -104 ARB_invalidate_subdata -105 ARB_map_buffer_alignment -106 ARB_map_buffer_range -107 ARB_matrix_palette -108 ARB_multi_bind -109 ARB_multi_draw_indirect -110 ARB_multisample -111 ARB_multitexture -112 ARB_occlusion_query -113 ARB_occlusion_query2 -114 ARB_pixel_buffer_object -115 ARB_point_parameters -116 ARB_point_sprite -117 ARB_program_interface_query -118 ARB_provoking_vertex -119 ARB_query_buffer_object -120 ARB_robust_buffer_access_behavior -121 ARB_robustness -122 ARB_robustness_application_isolation -123 ARB_robustness_share_group_isolation -124 ARB_sample_shading -125 ARB_sampler_objects -126 ARB_seamless_cube_map -127 ARB_seamless_cubemap_per_texture -128 ARB_separate_shader_objects -129 ARB_shader_atomic_counters -130 ARB_shader_bit_encoding -131 ARB_shader_draw_parameters -132 ARB_shader_group_vote -133 ARB_shader_image_load_store -134 ARB_shader_image_size -135 ARB_shader_objects -136 ARB_shader_precision -137 ARB_shader_stencil_export -138 ARB_shader_storage_buffer_object -139 ARB_shader_subroutine -140 ARB_shader_texture_lod -141 ARB_shading_language_100 -142 ARB_shading_language_420pack -143 ARB_shading_language_include -144 ARB_shading_language_packing -145 ARB_shadow -146 ARB_shadow_ambient -147 ARB_sparse_texture -148 ARB_stencil_texturing -149 ARB_sync -150 ARB_tessellation_shader -151 ARB_texture_border_clamp -152 ARB_texture_buffer_object -153 ARB_texture_buffer_object_rgb32 -154 ARB_texture_buffer_range -155 ARB_texture_compression -156 ARB_texture_compression_bptc -157 ARB_texture_compression_rgtc -158 ARB_texture_cube_map -159 ARB_texture_cube_map_array -160 ARB_texture_env_add -161 ARB_texture_env_combine -162 ARB_texture_env_crossbar -163 ARB_texture_env_dot3 -164 ARB_texture_float -165 ARB_texture_gather -166 ARB_texture_mirror_clamp_to_edge -167 ARB_texture_mirrored_repeat -168 ARB_texture_multisample -169 ARB_texture_non_power_of_two -170 ARB_texture_query_levels -171 ARB_texture_query_lod -172 ARB_texture_rectangle -173 ARB_texture_rg -174 ARB_texture_rgb10_a2ui -175 ARB_texture_stencil8 -176 ARB_texture_storage -177 ARB_texture_storage_multisample -178 ARB_texture_swizzle -179 ARB_texture_view -180 ARB_timer_query -181 ARB_transform_feedback2 -182 ARB_transform_feedback3 -183 ARB_transform_feedback_instanced -184 ARB_transpose_matrix -185 ARB_uniform_buffer_object -186 ARB_vertex_array_bgra -187 ARB_vertex_array_object -188 ARB_vertex_attrib_64bit -189 ARB_vertex_attrib_binding -190 ARB_vertex_blend -191 ARB_vertex_buffer_object -192 ARB_vertex_program -193 ARB_vertex_shader -194 ARB_vertex_type_10f_11f_11f_rev -195 ARB_vertex_type_2_10_10_10_rev -196 ARB_viewport_array -197 ARB_window_pos +58 ARB_ES2_compatibility +59 ARB_ES3_compatibility +60 ARB_arrays_of_arrays +61 ARB_base_instance +62 ARB_bindless_texture +63 ARB_blend_func_extended +64 ARB_buffer_storage +65 ARB_cl_event +66 ARB_clear_buffer_object +67 ARB_clear_texture +68 ARB_color_buffer_float +69 ARB_compatibility +70 ARB_compressed_texture_pixel_storage +71 ARB_compute_shader +72 ARB_compute_variable_group_size +73 ARB_conservative_depth +74 ARB_copy_buffer +75 ARB_copy_image +76 ARB_debug_output +77 ARB_depth_buffer_float +78 ARB_depth_clamp +79 ARB_depth_texture +80 ARB_draw_buffers +81 ARB_draw_buffers_blend +82 ARB_draw_elements_base_vertex +83 ARB_draw_indirect +84 ARB_draw_instanced +85 ARB_enhanced_layouts +86 ARB_explicit_attrib_location +87 ARB_explicit_uniform_location +88 ARB_fragment_coord_conventions +89 ARB_fragment_layer_viewport +90 ARB_fragment_program +91 ARB_fragment_program_shadow +92 ARB_fragment_shader +93 ARB_framebuffer_no_attachments +94 ARB_framebuffer_object +95 ARB_framebuffer_sRGB +96 ARB_geometry_shader4 +97 ARB_get_program_binary +98 ARB_gpu_shader5 +99 ARB_gpu_shader_fp64 +100 ARB_half_float_pixel +101 ARB_half_float_vertex +102 ARB_imaging +103 ARB_indirect_parameters +104 ARB_instanced_arrays +105 ARB_internalformat_query +106 ARB_internalformat_query2 +107 ARB_invalidate_subdata +108 ARB_map_buffer_alignment +109 ARB_map_buffer_range +110 ARB_matrix_palette +111 ARB_multi_bind +112 ARB_multi_draw_indirect +113 ARB_multisample +114 ARB_multitexture +115 ARB_occlusion_query +116 ARB_occlusion_query2 +117 ARB_pixel_buffer_object +118 ARB_point_parameters +119 ARB_point_sprite +120 ARB_program_interface_query +121 ARB_provoking_vertex +122 ARB_query_buffer_object +123 ARB_robust_buffer_access_behavior +124 ARB_robustness +125 ARB_robustness_application_isolation +126 ARB_robustness_share_group_isolation +127 ARB_sample_shading +128 ARB_sampler_objects +129 ARB_seamless_cube_map +130 ARB_seamless_cubemap_per_texture +131 ARB_separate_shader_objects +132 ARB_shader_atomic_counters +133 ARB_shader_bit_encoding +134 ARB_shader_draw_parameters +135 ARB_shader_group_vote +136 ARB_shader_image_load_store +137 ARB_shader_image_size +138 ARB_shader_objects +139 ARB_shader_precision +140 ARB_shader_stencil_export +141 ARB_shader_storage_buffer_object +142 ARB_shader_subroutine +143 ARB_shader_texture_lod +144 ARB_shading_language_100 +145 ARB_shading_language_420pack +146 ARB_shading_language_include +147 ARB_shading_language_packing +148 ARB_shadow +149 ARB_shadow_ambient +150 ARB_sparse_texture +151 ARB_stencil_texturing +152 ARB_sync +153 ARB_tessellation_shader +154 ARB_texture_border_clamp +155 ARB_texture_buffer_object +156 ARB_texture_buffer_object_rgb32 +157 ARB_texture_buffer_range +158 ARB_texture_compression +159 ARB_texture_compression_bptc +160 ARB_texture_compression_rgtc +161 ARB_texture_cube_map +162 ARB_texture_cube_map_array +163 ARB_texture_env_add +164 ARB_texture_env_combine +165 ARB_texture_env_crossbar +166 ARB_texture_env_dot3 +167 ARB_texture_float +168 ARB_texture_gather +169 ARB_texture_mirror_clamp_to_edge +170 ARB_texture_mirrored_repeat +171 ARB_texture_multisample +172 ARB_texture_non_power_of_two +173 ARB_texture_query_levels +174 ARB_texture_query_lod +175 ARB_texture_rectangle +176 ARB_texture_rg +177 ARB_texture_rgb10_a2ui +178 ARB_texture_stencil8 +179 ARB_texture_storage +180 ARB_texture_storage_multisample +181 ARB_texture_swizzle +182 ARB_texture_view +183 ARB_timer_query +184 ARB_transform_feedback2 +185 ARB_transform_feedback3 +186 ARB_transform_feedback_instanced +187 ARB_transpose_matrix +188 ARB_uniform_buffer_object +189 ARB_vertex_array_bgra +190 ARB_vertex_array_object +191 ARB_vertex_attrib_64bit +192 ARB_vertex_attrib_binding +193 ARB_vertex_blend +194 ARB_vertex_buffer_object +195 ARB_vertex_program +196 ARB_vertex_shader +197 ARB_vertex_type_10f_11f_11f_rev +198 ARB_vertex_type_2_10_10_10_rev +199 ARB_viewport_array +200 ARB_window_pos
    -198 ATIX_point_sprites -199 ATIX_texture_env_combine3 -200 ATIX_texture_env_route -201 ATIX_vertex_shader_output_point_size +201 ATIX_point_sprites +202 ATIX_texture_env_combine3 +203 ATIX_texture_env_route +204 ATIX_vertex_shader_output_point_size
    -202 ATI_draw_buffers -203 ATI_element_array -204 ATI_envmap_bumpmap -205 ATI_fragment_shader -206 ATI_map_object_buffer -207 ATI_meminfo -208 ATI_pn_triangles -209 ATI_separate_stencil -210 ATI_shader_texture_lod -211 ATI_text_fragment_shader -212 ATI_texture_compression_3dc -213 ATI_texture_env_combine3 -214 ATI_texture_float -215 ATI_texture_mirror_once -216 ATI_vertex_array_object -217 ATI_vertex_attrib_array_object -218 ATI_vertex_streams +205 ATI_draw_buffers +206 ATI_element_array +207 ATI_envmap_bumpmap +208 ATI_fragment_shader +209 ATI_map_object_buffer +210 ATI_meminfo +211 ATI_pn_triangles +212 ATI_separate_stencil +213 ATI_shader_texture_lod +214 ATI_text_fragment_shader +215 ATI_texture_compression_3dc +216 ATI_texture_env_combine3 +217 ATI_texture_float +218 ATI_texture_mirror_once +219 ATI_vertex_array_object +220 ATI_vertex_attrib_array_object +221 ATI_vertex_streams
    -219 EXT_422_pixels -220 EXT_Cg_shader -221 EXT_abgr -222 EXT_bgra -223 EXT_bindable_uniform -224 EXT_blend_color -225 EXT_blend_equation_separate -226 EXT_blend_func_separate -227 EXT_blend_logic_op -228 EXT_blend_minmax -229 EXT_blend_subtract -230 EXT_clip_volume_hint -231 EXT_cmyka -232 EXT_color_subtable -233 EXT_compiled_vertex_array -234 EXT_convolution -235 EXT_coordinate_frame -236 EXT_copy_texture -237 EXT_cull_vertex -238 EXT_debug_marker -239 EXT_depth_bounds_test -240 EXT_direct_state_access -241 EXT_draw_buffers2 -242 EXT_draw_instanced -243 EXT_draw_range_elements -244 EXT_fog_coord -245 EXT_fragment_lighting -246 EXT_framebuffer_blit -247 EXT_framebuffer_multisample -248 EXT_framebuffer_multisample_blit_scaled -249 EXT_framebuffer_object -250 EXT_framebuffer_sRGB -251 EXT_geometry_shader4 -252 EXT_gpu_program_parameters -253 EXT_gpu_shader4 -254 EXT_histogram -255 EXT_index_array_formats -256 EXT_index_func -257 EXT_index_material -258 EXT_index_texture -259 EXT_light_texture -260 EXT_misc_attribute -261 EXT_multi_draw_arrays -262 EXT_multisample -263 EXT_packed_depth_stencil -264 EXT_packed_float -265 EXT_packed_pixels -266 EXT_paletted_texture -267 EXT_pixel_buffer_object -268 EXT_pixel_transform -269 EXT_pixel_transform_color_table -270 EXT_point_parameters -271 EXT_polygon_offset -272 EXT_provoking_vertex -273 EXT_rescale_normal -274 EXT_scene_marker -275 EXT_secondary_color -276 EXT_separate_shader_objects -277 EXT_separate_specular_color -278 EXT_shader_image_load_store -279 EXT_shadow_funcs -280 EXT_shared_texture_palette -281 EXT_stencil_clear_tag -282 EXT_stencil_two_side -283 EXT_stencil_wrap -284 EXT_subtexture -285 EXT_texture -286 EXT_texture3D -287 EXT_texture_array -288 EXT_texture_buffer_object -289 EXT_texture_compression_dxt1 -290 EXT_texture_compression_latc -291 EXT_texture_compression_rgtc -292 EXT_texture_compression_s3tc -293 EXT_texture_cube_map -294 EXT_texture_edge_clamp -295 EXT_texture_env -296 EXT_texture_env_add -297 EXT_texture_env_combine -298 EXT_texture_env_dot3 -299 EXT_texture_filter_anisotropic -300 EXT_texture_integer -301 EXT_texture_lod_bias -302 EXT_texture_mirror_clamp -303 EXT_texture_object -304 EXT_texture_perturb_normal -305 EXT_texture_rectangle -306 EXT_texture_sRGB -307 EXT_texture_sRGB_decode -308 EXT_texture_shared_exponent -309 EXT_texture_snorm -310 EXT_texture_swizzle -311 EXT_timer_query -312 EXT_transform_feedback -313 EXT_vertex_array -314 EXT_vertex_array_bgra -315 EXT_vertex_attrib_64bit -316 EXT_vertex_shader -317 EXT_vertex_weighting -318 EXT_x11_sync_object +222 EXT_422_pixels +223 EXT_Cg_shader +224 EXT_abgr +225 EXT_bgra +226 EXT_bindable_uniform +227 EXT_blend_color +228 EXT_blend_equation_separate +229 EXT_blend_func_separate +230 EXT_blend_logic_op +231 EXT_blend_minmax +232 EXT_blend_subtract +233 EXT_clip_volume_hint +234 EXT_cmyka +235 EXT_color_subtable +236 EXT_compiled_vertex_array +237 EXT_convolution +238 EXT_coordinate_frame +239 EXT_copy_texture +240 EXT_cull_vertex +241 EXT_debug_label +242 EXT_debug_marker +243 EXT_depth_bounds_test +244 EXT_direct_state_access +245 EXT_draw_buffers2 +246 EXT_draw_instanced +247 EXT_draw_range_elements +248 EXT_fog_coord +249 EXT_fragment_lighting +250 EXT_framebuffer_blit +251 EXT_framebuffer_multisample +252 EXT_framebuffer_multisample_blit_scaled +253 EXT_framebuffer_object +254 EXT_framebuffer_sRGB +255 EXT_geometry_shader4 +256 EXT_gpu_program_parameters +257 EXT_gpu_shader4 +258 EXT_histogram +259 EXT_index_array_formats +260 EXT_index_func +261 EXT_index_material +262 EXT_index_texture +263 EXT_light_texture +264 EXT_misc_attribute +265 EXT_multi_draw_arrays +266 EXT_multisample +267 EXT_packed_depth_stencil +268 EXT_packed_float +269 EXT_packed_pixels +270 EXT_paletted_texture +271 EXT_pixel_buffer_object +272 EXT_pixel_transform +273 EXT_pixel_transform_color_table +274 EXT_point_parameters +275 EXT_polygon_offset +276 EXT_provoking_vertex +277 EXT_rescale_normal +278 EXT_scene_marker +279 EXT_secondary_color +280 EXT_separate_shader_objects +281 EXT_separate_specular_color +282 EXT_shader_image_load_store +283 EXT_shader_integer_mix +284 EXT_shadow_funcs +285 EXT_shared_texture_palette +286 EXT_stencil_clear_tag +287 EXT_stencil_two_side +288 EXT_stencil_wrap +289 EXT_subtexture +290 EXT_texture +291 EXT_texture3D +292 EXT_texture_array +293 EXT_texture_buffer_object +294 EXT_texture_compression_dxt1 +295 EXT_texture_compression_latc +296 EXT_texture_compression_rgtc +297 EXT_texture_compression_s3tc +298 EXT_texture_cube_map +299 EXT_texture_edge_clamp +300 EXT_texture_env +301 EXT_texture_env_add +302 EXT_texture_env_combine +303 EXT_texture_env_dot3 +304 EXT_texture_filter_anisotropic +305 EXT_texture_integer +306 EXT_texture_lod_bias +307 EXT_texture_mirror_clamp +308 EXT_texture_object +309 EXT_texture_perturb_normal +310 EXT_texture_rectangle +311 EXT_texture_sRGB +312 EXT_texture_sRGB_decode +313 EXT_texture_shared_exponent +314 EXT_texture_snorm +315 EXT_texture_swizzle +316 EXT_timer_query +317 EXT_transform_feedback +318 EXT_vertex_array +319 EXT_vertex_array_bgra +320 EXT_vertex_attrib_64bit +321 EXT_vertex_shader +322 EXT_vertex_weighting +323 EXT_x11_sync_object
    -319 GREMEDY_frame_terminator -320 GREMEDY_string_marker +324 GREMEDY_frame_terminator +325 GREMEDY_string_marker
    -321 HP_convolution_border_modes -322 HP_image_transform -323 HP_occlusion_test -324 HP_texture_lighting +326 HP_convolution_border_modes +327 HP_image_transform +328 HP_occlusion_test +329 HP_texture_lighting
    -325 IBM_cull_vertex -326 IBM_multimode_draw_arrays -327 IBM_rasterpos_clip -328 IBM_static_data -329 IBM_texture_mirrored_repeat -330 IBM_vertex_array_lists +330 IBM_cull_vertex +331 IBM_multimode_draw_arrays +332 IBM_rasterpos_clip +333 IBM_static_data +334 IBM_texture_mirrored_repeat +335 IBM_vertex_array_lists
    -331 INGR_color_clamp -332 INGR_interlace_read +336 INGR_color_clamp +337 INGR_interlace_read
    -333 INTEL_map_texture -334 INTEL_parallel_arrays -335 INTEL_texture_scissor +338 INTEL_fragment_shader_ordering +339 INTEL_map_texture +340 INTEL_parallel_arrays +341 INTEL_performance_query +342 INTEL_texture_scissor
    -336 KHR_debug -337 KHR_texture_compression_astc_ldr +343 KHR_debug +344 KHR_texture_compression_astc_hdr +345 KHR_texture_compression_astc_ldr
    -338 KTX_buffer_region +346 KTX_buffer_region
    -339 MESAX_texture_stack +347 MESAX_texture_stack
    -340 MESA_pack_invert -341 MESA_resize_buffers -342 MESA_window_pos -343 MESA_ycbcr_texture +348 MESA_pack_invert +349 MESA_resize_buffers +350 MESA_window_pos +351 MESA_ycbcr_texture
    -344 NVX_conditional_render -345 NVX_gpu_memory_info +352 NVX_conditional_render +353 NVX_gpu_memory_info
    -346 NV_bindless_multi_draw_indirect -347 NV_bindless_texture -348 NV_blend_equation_advanced -349 NV_blend_equation_advanced_coherent -350 NV_blend_square -351 NV_compute_program5 -352 NV_conditional_render -353 NV_copy_depth_to_color -354 NV_copy_image -355 NV_deep_texture3D -356 NV_depth_buffer_float -357 NV_depth_clamp -358 NV_depth_range_unclamped -359 NV_draw_texture -360 NV_evaluators -361 NV_explicit_multisample -362 NV_fence -363 NV_float_buffer -364 NV_fog_distance -365 NV_fragment_program -366 NV_fragment_program2 -367 NV_fragment_program4 -368 NV_fragment_program_option -369 NV_framebuffer_multisample_coverage -370 NV_geometry_program4 -371 NV_geometry_shader4 -372 NV_gpu_program4 -373 NV_gpu_program5 -374 NV_gpu_program5_mem_extended -375 NV_gpu_program_fp64 -376 NV_gpu_shader5 -377 NV_half_float -378 NV_light_max_exponent -379 NV_multisample_coverage -380 NV_multisample_filter_hint -381 NV_occlusion_query -382 NV_packed_depth_stencil -383 NV_parameter_buffer_object -384 NV_parameter_buffer_object2 -385 NV_path_rendering -386 NV_pixel_data_range -387 NV_point_sprite -388 NV_present_video -389 NV_primitive_restart -390 NV_register_combiners -391 NV_register_combiners2 -392 NV_shader_atomic_counters -393 NV_shader_atomic_float -394 NV_shader_buffer_load -395 NV_shader_storage_buffer_object -396 NV_tessellation_program5 -397 NV_texgen_emboss -398 NV_texgen_reflection -399 NV_texture_barrier -400 NV_texture_compression_vtc -401 NV_texture_env_combine4 -402 NV_texture_expand_normal -403 NV_texture_multisample -404 NV_texture_rectangle -405 NV_texture_shader -406 NV_texture_shader2 -407 NV_texture_shader3 -408 NV_transform_feedback -409 NV_transform_feedback2 -410 NV_vdpau_interop -411 NV_vertex_array_range -412 NV_vertex_array_range2 -413 NV_vertex_attrib_integer_64bit -414 NV_vertex_buffer_unified_memory -415 NV_vertex_program -416 NV_vertex_program1_1 -417 NV_vertex_program2 -418 NV_vertex_program2_option -419 NV_vertex_program3 -420 NV_vertex_program4 -421 NV_video_capture +354 NV_bindless_multi_draw_indirect +355 NV_bindless_texture +356 NV_blend_equation_advanced +357 NV_blend_equation_advanced_coherent +358 NV_blend_square +359 NV_compute_program5 +360 NV_conditional_render +361 NV_copy_depth_to_color +362 NV_copy_image +363 NV_deep_texture3D +364 NV_depth_buffer_float +365 NV_depth_clamp +366 NV_depth_range_unclamped +367 NV_draw_texture +368 NV_evaluators +369 NV_explicit_multisample +370 NV_fence +371 NV_float_buffer +372 NV_fog_distance +373 NV_fragment_program +374 NV_fragment_program2 +375 NV_fragment_program4 +376 NV_fragment_program_option +377 NV_framebuffer_multisample_coverage +378 NV_geometry_program4 +379 NV_geometry_shader4 +380 NV_gpu_program4 +381 NV_gpu_program5 +382 NV_gpu_program5_mem_extended +383 NV_gpu_program_fp64 +384 NV_gpu_shader5 +385 NV_half_float +386 NV_light_max_exponent +387 NV_multisample_coverage +388 NV_multisample_filter_hint +389 NV_occlusion_query +390 NV_packed_depth_stencil +391 NV_parameter_buffer_object +392 NV_parameter_buffer_object2 +393 NV_path_rendering +394 NV_pixel_data_range +395 NV_point_sprite +396 NV_present_video +397 NV_primitive_restart +398 NV_register_combiners +399 NV_register_combiners2 +400 NV_shader_atomic_counters +401 NV_shader_atomic_float +402 NV_shader_buffer_load +403 NV_shader_storage_buffer_object +404 NV_tessellation_program5 +405 NV_texgen_emboss +406 NV_texgen_reflection +407 NV_texture_barrier +408 NV_texture_compression_vtc +409 NV_texture_env_combine4 +410 NV_texture_expand_normal +411 NV_texture_multisample +412 NV_texture_rectangle +413 NV_texture_shader +414 NV_texture_shader2 +415 NV_texture_shader3 +416 NV_transform_feedback +417 NV_transform_feedback2 +418 NV_vdpau_interop +419 NV_vertex_array_range +420 NV_vertex_array_range2 +421 NV_vertex_attrib_integer_64bit +422 NV_vertex_buffer_unified_memory +423 NV_vertex_program +424 NV_vertex_program1_1 +425 NV_vertex_program2 +426 NV_vertex_program2_option +427 NV_vertex_program3 +428 NV_vertex_program4 +429 NV_video_capture
    -422 OES_byte_coordinates -423 OES_compressed_paletted_texture -424 OES_read_format -425 OES_single_precision +430 OES_byte_coordinates +431 OES_compressed_paletted_texture +432 OES_read_format +433 OES_single_precision
    -426 OML_interlace -427 OML_resample -428 OML_subsample +434 OML_interlace +435 OML_resample +436 OML_subsample
    -429 PGI_misc_hints -430 PGI_vertex_hints +437 PGI_misc_hints +438 PGI_vertex_hints
    -431 REGAL_ES1_0_compatibility -432 REGAL_ES1_1_compatibility -433 REGAL_enable -434 REGAL_error_string -435 REGAL_extension_query -436 REGAL_log +439 REGAL_ES1_0_compatibility +440 REGAL_ES1_1_compatibility +441 REGAL_enable +442 REGAL_error_string +443 REGAL_extension_query +444 REGAL_log +445 REGAL_proc_address
    -437 REND_screen_coordinates +446 REND_screen_coordinates
    -438 S3_s3tc +447 S3_s3tc
    -439 SGIS_color_range -440 SGIS_detail_texture -441 SGIS_fog_function -442 SGIS_generate_mipmap -443 SGIS_multisample -444 SGIS_pixel_texture -445 SGIS_point_line_texgen -446 SGIS_sharpen_texture -447 SGIS_texture4D -448 SGIS_texture_border_clamp -449 SGIS_texture_edge_clamp -450 SGIS_texture_filter4 -451 SGIS_texture_lod -452 SGIS_texture_select +448 SGIS_color_range +449 SGIS_detail_texture +450 SGIS_fog_function +451 SGIS_generate_mipmap +452 SGIS_multisample +453 SGIS_pixel_texture +454 SGIS_point_line_texgen +455 SGIS_sharpen_texture +456 SGIS_texture4D +457 SGIS_texture_border_clamp +458 SGIS_texture_edge_clamp +459 SGIS_texture_filter4 +460 SGIS_texture_lod +461 SGIS_texture_select
    -453 SGIX_async -454 SGIX_async_histogram -455 SGIX_async_pixel -456 SGIX_blend_alpha_minmax -457 SGIX_clipmap -458 SGIX_convolution_accuracy -459 SGIX_depth_texture -460 SGIX_flush_raster -461 SGIX_fog_offset -462 SGIX_fog_texture -463 SGIX_fragment_specular_lighting -464 SGIX_framezoom -465 SGIX_interlace -466 SGIX_ir_instrument1 -467 SGIX_list_priority -468 SGIX_pixel_texture -469 SGIX_pixel_texture_bits -470 SGIX_reference_plane -471 SGIX_resample -472 SGIX_shadow -473 SGIX_shadow_ambient -474 SGIX_sprite -475 SGIX_tag_sample_buffer -476 SGIX_texture_add_env -477 SGIX_texture_coordinate_clamp -478 SGIX_texture_lod_bias -479 SGIX_texture_multi_buffer -480 SGIX_texture_range -481 SGIX_texture_scale_bias -482 SGIX_vertex_preclip -483 SGIX_vertex_preclip_hint -484 SGIX_ycrcb +462 SGIX_async +463 SGIX_async_histogram +464 SGIX_async_pixel +465 SGIX_blend_alpha_minmax +466 SGIX_clipmap +467 SGIX_convolution_accuracy +468 SGIX_depth_texture +469 SGIX_flush_raster +470 SGIX_fog_offset +471 SGIX_fog_texture +472 SGIX_fragment_specular_lighting +473 SGIX_framezoom +474 SGIX_interlace +475 SGIX_ir_instrument1 +476 SGIX_list_priority +477 SGIX_pixel_texture +478 SGIX_pixel_texture_bits +479 SGIX_reference_plane +480 SGIX_resample +481 SGIX_shadow +482 SGIX_shadow_ambient +483 SGIX_sprite +484 SGIX_tag_sample_buffer +485 SGIX_texture_add_env +486 SGIX_texture_coordinate_clamp +487 SGIX_texture_lod_bias +488 SGIX_texture_multi_buffer +489 SGIX_texture_range +490 SGIX_texture_scale_bias +491 SGIX_vertex_preclip +492 SGIX_vertex_preclip_hint +493 SGIX_ycrcb
    -485 SGI_color_matrix -486 SGI_color_table -487 SGI_texture_color_table +494 SGI_color_matrix +495 SGI_color_table +496 SGI_texture_color_table
    -488 SUNX_constant_data +497 SUNX_constant_data
    -489 SUN_convolution_border_modes -490 SUN_global_alpha -491 SUN_mesh_array -492 SUN_read_video_pixels -493 SUN_slice_accum -494 SUN_triangle_list -495 SUN_vertex +498 SUN_convolution_border_modes +499 SUN_global_alpha +500 SUN_mesh_array +501 SUN_read_video_pixels +502 SUN_slice_accum +503 SUN_triangle_list +504 SUN_vertex
    -496 WIN_phong_shading -497 WIN_specular_fog -498 WIN_swap_hint +505 WIN_phong_shading +506 WIN_specular_fog +507 WIN_swap_hint diff --git a/doc/index.html b/doc/index.html index 2969b94..32d10e8 100644 --- a/doc/index.html +++ b/doc/index.html @@ -159,8 +159,9 @@ An up-to-date copy is also available using git Unsupported snapshots are also available:

    Supported Extensions

    diff --git a/doc/wglew.html b/doc/wglew.html index 3f9cee4..dfc3ef8 100644 --- a/doc/wglew.html +++ b/doc/wglew.html @@ -148,18 +148,19 @@ width="88" height="32" border="0" alt="Support This Project"> --> 39 NV_DX_interop 40 NV_DX_interop2 41 NV_copy_image -42 NV_float_buffer -43 NV_gpu_affinity -44 NV_multisample_coverage -45 NV_present_video -46 NV_render_depth_texture -47 NV_render_texture_rectangle -48 NV_swap_group -49 NV_vertex_array_range -50 NV_video_capture -51 NV_video_output +42 NV_delay_before_swap +43 NV_float_buffer +44 NV_gpu_affinity +45 NV_multisample_coverage +46 NV_present_video +47 NV_render_depth_texture +48 NV_render_texture_rectangle +49 NV_swap_group +50 NV_vertex_array_range +51 NV_video_capture +52 NV_video_output
    -52 OML_sync_control +53 OML_sync_control diff --git a/src/visualinfo.c b/src/visualinfo.c index b8bb59e..93957fd 100644 --- a/src/visualinfo.c +++ b/src/visualinfo.c @@ -4,6 +4,7 @@ ** Copyright (C) Nate Robins, 1997 ** Michael Wimmer, 1999 ** Milan Ikits, 2002-2008 +** Nigel Stewart, 2008-2013 ** ** visualinfo is a small utility that displays all available visuals, ** aka. pixelformats, in an OpenGL system along with renderer version @@ -37,7 +38,7 @@ #include #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX) #include -#else +#elif !defined(__HAIKU__) #include #endif @@ -47,7 +48,7 @@ GLEWContext _glewctx; # ifdef _WIN32 WGLEWContext _wglewctx; # define wglewGetContext() (&_wglewctx) -# elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) +# elif !defined(__APPLE__) && !defined(__HAIKU__) || defined(GLEW_APPLE_GLX) GLXEWContext _glxewctx; # define glxewGetContext() (&_glxewctx) # endif @@ -61,7 +62,7 @@ typedef struct GLContextStruct HGLRC rc; #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX) AGLContext ctx, octx; -#else +#elif !defined(__HAIKU__) Display* dpy; XVisualInfo* vi; GLXContext ctx; @@ -129,7 +130,7 @@ main (int argc, char** argv) err = glewContextInit(glewGetContext()); # ifdef _WIN32 err = err || wglewContextInit(wglewGetContext()); -# elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) +# elif !defined(__APPLE__) && !defined(__HAIKU__) || defined(GLEW_APPLE_GLX) err = err || glxewContextInit(glxewGetContext()); # endif #else @@ -145,8 +146,15 @@ main (int argc, char** argv) /* ---------------------------------------------------------------------- */ /* open file */ #if defined(_WIN32) - if (!displaystdout) + if (!displaystdout) + { +#if defined(_MSC_VER) && (_MSC_VER >= 1400) + if (fopen_s(&file, "visualinfo.txt", "w") != 0) + file = stdout; +#else file = fopen("visualinfo.txt", "w"); +#endif + } if (file == NULL) file = stdout; #else @@ -182,6 +190,10 @@ main (int argc, char** argv) } #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX) +#elif defined(__HAIKU__) + + /* TODO */ + #else /* GLX extensions */ fprintf(file, "GLX extensions (GLX_): \n"); @@ -231,7 +243,11 @@ void PrintExtensions (const char* s) fprintf(file, " %s\n", t); p++; i = (int)strlen(p); +#if defined(_MSC_VER) && (_MSC_VER >= 1400) + strcpy_s(t, sizeof(t), p); +#else strcpy(t, p); +#endif } s++; } @@ -582,7 +598,7 @@ VisualInfo (GLContext* ctx) #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX) void -VisualInfo (GLContext* ctx) +VisualInfo (GLContext* __attribute__((__unused__)) ctx) { /* int attrib[] = { AGL_RGBA, AGL_NONE }; @@ -598,6 +614,16 @@ VisualInfo (GLContext* ctx) */ } +/* ---------------------------------------------------------------------- */ + +#elif defined(__HAIKU__) + +void +VisualInfo (GLContext* ctx) +{ + /* TODO */ +} + #else /* GLX */ void @@ -1074,6 +1100,29 @@ void DestroyContext (GLContext* ctx) /* ------------------------------------------------------------------------ */ +#elif defined(__HAIKU__) + +void +InitContext (GLContext* ctx) +{ + /* TODO */ +} + +GLboolean +CreateContext (GLContext* ctx) +{ + /* TODO */ + return GL_FALSE; +} + +void +DestroyContext (GLContext* ctx) +{ + /* TODO */ +} + +/* ------------------------------------------------------------------------ */ + #else /* __UNIX || (__APPLE__ && GLEW_APPLE_GLX) */ void InitContext (GLContext* ctx)