diff --git a/gfx/glsym/glsym_gl.c b/gfx/glsym/glsym_gl.c index 97564bc1f0..c42725b6b9 100644 --- a/gfx/glsym/glsym_gl.c +++ b/gfx/glsym/glsym_gl.c @@ -311,8 +311,10 @@ const struct rglgen_sym_map rglgen_symbol_map[] = { SYM(DrawElementsInstanced), SYM(TexBuffer), SYM(PrimitiveRestartIndex), +#ifndef OSX_10_6_SNOW_LEOPARD SYM(GetInteger64i_v), SYM(GetBufferParameteri64v), +#endif SYM(FramebufferTexture), SYM(VertexAttribDivisor), SYM(MinSampleShading), @@ -571,6 +573,7 @@ const struct rglgen_sym_map rglgen_symbol_map[] = { SYM(DrawElementsInstancedBaseVertex), SYM(MultiDrawElementsBaseVertex), SYM(ProvokingVertex), +#ifndef OSX_10_6_SNOW_LEOPARD SYM(FenceSync), SYM(IsSync), SYM(DeleteSync), @@ -578,6 +581,7 @@ const struct rglgen_sym_map rglgen_symbol_map[] = { SYM(WaitSync), SYM(GetInteger64v), SYM(GetSynciv), +#endif SYM(TexImage2DMultisample), SYM(TexImage3DMultisample), SYM(GetMultisamplefv), @@ -610,8 +614,10 @@ const struct rglgen_sym_map rglgen_symbol_map[] = { SYM(GetSamplerParameterfv), SYM(GetSamplerParameterIuiv), SYM(QueryCounter), +#ifndef OSX_10_6_SNOW_LEOPARD SYM(GetQueryObjecti64v), SYM(GetQueryObjectui64v), +#endif SYM(VertexP2ui), SYM(VertexP2uiv), SYM(VertexP3ui), @@ -779,8 +785,10 @@ const struct rglgen_sym_map rglgen_symbol_map[] = { SYM(DepthRangeIndexed), SYM(GetFloati_v), SYM(GetDoublei_v), +#ifndef OSX_10_6_SNOW_LEOPARD SYM(CreateSyncFromCLeventARB), SYM(DebugMessageControlARB), +#endif SYM(DebugMessageInsertARB), SYM(DebugMessageCallbackARB), SYM(GetDebugMessageLogARB), @@ -840,7 +848,9 @@ const struct rglgen_sym_map rglgen_symbol_map[] = { SYM(VertexBindingDivisor), SYM(FramebufferParameteri), SYM(GetFramebufferParameteriv), +#ifndef OSX_10_6_SNOW_LEOPARD SYM(GetInternalformati64v), +#endif SYM(InvalidateTexSubImage), SYM(InvalidateTexImage), SYM(InvalidateBufferSubData), @@ -1310,8 +1320,10 @@ RGLSYMGLDRAWARRAYSINSTANCEDPROC __rglgen_glDrawArraysInstanced; RGLSYMGLDRAWELEMENTSINSTANCEDPROC __rglgen_glDrawElementsInstanced; RGLSYMGLTEXBUFFERPROC __rglgen_glTexBuffer; RGLSYMGLPRIMITIVERESTARTINDEXPROC __rglgen_glPrimitiveRestartIndex; +#ifndef OSX_10_6_SNOW_LEOPARD RGLSYMGLGETINTEGER64I_VPROC __rglgen_glGetInteger64i_v; RGLSYMGLGETBUFFERPARAMETERI64VPROC __rglgen_glGetBufferParameteri64v; +#endif RGLSYMGLFRAMEBUFFERTEXTUREPROC __rglgen_glFramebufferTexture; RGLSYMGLVERTEXATTRIBDIVISORPROC __rglgen_glVertexAttribDivisor; RGLSYMGLMINSAMPLESHADINGPROC __rglgen_glMinSampleShading; @@ -1570,6 +1582,7 @@ RGLSYMGLDRAWRANGEELEMENTSBASEVERTEXPROC __rglgen_glDrawRangeElementsBaseVertex; RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC __rglgen_glDrawElementsInstancedBaseVertex; RGLSYMGLMULTIDRAWELEMENTSBASEVERTEXPROC __rglgen_glMultiDrawElementsBaseVertex; RGLSYMGLPROVOKINGVERTEXPROC __rglgen_glProvokingVertex; +#ifndef OSX_10_6_SNOW_LEOPARD RGLSYMGLFENCESYNCPROC __rglgen_glFenceSync; RGLSYMGLISSYNCPROC __rglgen_glIsSync; RGLSYMGLDELETESYNCPROC __rglgen_glDeleteSync; @@ -1577,6 +1590,7 @@ RGLSYMGLCLIENTWAITSYNCPROC __rglgen_glClientWaitSync; RGLSYMGLWAITSYNCPROC __rglgen_glWaitSync; RGLSYMGLGETINTEGER64VPROC __rglgen_glGetInteger64v; RGLSYMGLGETSYNCIVPROC __rglgen_glGetSynciv; +#endif RGLSYMGLTEXIMAGE2DMULTISAMPLEPROC __rglgen_glTexImage2DMultisample; RGLSYMGLTEXIMAGE3DMULTISAMPLEPROC __rglgen_glTexImage3DMultisample; RGLSYMGLGETMULTISAMPLEFVPROC __rglgen_glGetMultisamplefv; @@ -1609,8 +1623,10 @@ RGLSYMGLGETSAMPLERPARAMETERIIVPROC __rglgen_glGetSamplerParameterIiv; RGLSYMGLGETSAMPLERPARAMETERFVPROC __rglgen_glGetSamplerParameterfv; RGLSYMGLGETSAMPLERPARAMETERIUIVPROC __rglgen_glGetSamplerParameterIuiv; RGLSYMGLQUERYCOUNTERPROC __rglgen_glQueryCounter; +#ifndef OSX_10_6_SNOW_LEOPARD RGLSYMGLGETQUERYOBJECTI64VPROC __rglgen_glGetQueryObjecti64v; RGLSYMGLGETQUERYOBJECTUI64VPROC __rglgen_glGetQueryObjectui64v; +#endif RGLSYMGLVERTEXP2UIPROC __rglgen_glVertexP2ui; RGLSYMGLVERTEXP2UIVPROC __rglgen_glVertexP2uiv; RGLSYMGLVERTEXP3UIPROC __rglgen_glVertexP3ui; @@ -1778,7 +1794,9 @@ RGLSYMGLDEPTHRANGEARRAYVPROC __rglgen_glDepthRangeArrayv; RGLSYMGLDEPTHRANGEINDEXEDPROC __rglgen_glDepthRangeIndexed; RGLSYMGLGETFLOATI_VPROC __rglgen_glGetFloati_v; RGLSYMGLGETDOUBLEI_VPROC __rglgen_glGetDoublei_v; +#ifndef OSX_10_6_SNOW_LEOPARD RGLSYMGLCREATESYNCFROMCLEVENTARBPROC __rglgen_glCreateSyncFromCLeventARB; +#endif RGLSYMGLDEBUGMESSAGECONTROLARBPROC __rglgen_glDebugMessageControlARB; RGLSYMGLDEBUGMESSAGEINSERTARBPROC __rglgen_glDebugMessageInsertARB; RGLSYMGLDEBUGMESSAGECALLBACKARBPROC __rglgen_glDebugMessageCallbackARB; @@ -1839,7 +1857,9 @@ RGLSYMGLVERTEXATTRIBBINDINGPROC __rglgen_glVertexAttribBinding; RGLSYMGLVERTEXBINDINGDIVISORPROC __rglgen_glVertexBindingDivisor; RGLSYMGLFRAMEBUFFERPARAMETERIPROC __rglgen_glFramebufferParameteri; RGLSYMGLGETFRAMEBUFFERPARAMETERIVPROC __rglgen_glGetFramebufferParameteriv; +#ifndef OSX_10_6_SNOW_LEOPARD RGLSYMGLGETINTERNALFORMATI64VPROC __rglgen_glGetInternalformati64v; +#endif RGLSYMGLINVALIDATETEXSUBIMAGEPROC __rglgen_glInvalidateTexSubImage; RGLSYMGLINVALIDATETEXIMAGEPROC __rglgen_glInvalidateTexImage; RGLSYMGLINVALIDATEBUFFERSUBDATAPROC __rglgen_glInvalidateBufferSubData; diff --git a/gfx/glsym/glsym_gl.h b/gfx/glsym/glsym_gl.h index 6e71aefda1..812e5ee9a0 100644 --- a/gfx/glsym/glsym_gl.h +++ b/gfx/glsym/glsym_gl.h @@ -21,6 +21,9 @@ typedef void *GLeglImageOES; #if !defined(GL_OES_fixed_point) && !defined(HAVE_OPENGLES2) typedef GLint GLfixed; #endif +#if defined(OSX) && !defined(MAC_OS_X_VERSION_10_7) +#define OSX_10_6_SNOW_LEOPARD 1 +#endif typedef void (APIENTRYP RGLSYMGLBLENDCOLORPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); typedef void (APIENTRYP RGLSYMGLBLENDEQUATIONPROC) (GLenum mode); typedef void (APIENTRYP RGLSYMGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); @@ -330,8 +333,10 @@ typedef void (APIENTRYP RGLSYMGLDRAWARRAYSINSTANCEDPROC) (GLenum mode, GLint fir typedef void (APIENTRYP RGLSYMGLDRAWELEMENTSINSTANCEDPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount); typedef void (APIENTRYP RGLSYMGLTEXBUFFERPROC) (GLenum target, GLenum internalformat, GLuint buffer); typedef void (APIENTRYP RGLSYMGLPRIMITIVERESTARTINDEXPROC) (GLuint index); +#ifndef OSX_10_6_SNOW_LEOPARD typedef void (APIENTRYP RGLSYMGLGETINTEGER64I_VPROC) (GLenum target, GLuint index, GLint64 *data); typedef void (APIENTRYP RGLSYMGLGETBUFFERPARAMETERI64VPROC) (GLenum target, GLenum pname, GLint64 *params); +#endif typedef void (APIENTRYP RGLSYMGLFRAMEBUFFERTEXTUREPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level); typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBDIVISORPROC) (GLuint index, GLuint divisor); typedef void (APIENTRYP RGLSYMGLMINSAMPLESHADINGPROC) (GLfloat value); @@ -590,6 +595,7 @@ typedef void (APIENTRYP RGLSYMGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, G typedef void (APIENTRYP RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount, GLint basevertex); typedef void (APIENTRYP RGLSYMGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount, const GLint *basevertex); typedef void (APIENTRYP RGLSYMGLPROVOKINGVERTEXPROC) (GLenum mode); +#ifndef OSX_10_6_SNOW_LEOPARD typedef GLsync (APIENTRYP RGLSYMGLFENCESYNCPROC) (GLenum condition, GLbitfield flags); typedef GLboolean (APIENTRYP RGLSYMGLISSYNCPROC) (GLsync sync); typedef void (APIENTRYP RGLSYMGLDELETESYNCPROC) (GLsync sync); @@ -597,6 +603,8 @@ typedef GLenum (APIENTRYP RGLSYMGLCLIENTWAITSYNCPROC) (GLsync sync, GLbitfield f typedef void (APIENTRYP RGLSYMGLWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); typedef void (APIENTRYP RGLSYMGLGETINTEGER64VPROC) (GLenum pname, GLint64 *params); typedef void (APIENTRYP RGLSYMGLGETSYNCIVPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); +#endif + typedef void (APIENTRYP RGLSYMGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); typedef void (APIENTRYP RGLSYMGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); typedef void (APIENTRYP RGLSYMGLGETMULTISAMPLEFVPROC) (GLenum pname, GLuint index, GLfloat *val); @@ -629,8 +637,10 @@ typedef void (APIENTRYP RGLSYMGLGETSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLe typedef void (APIENTRYP RGLSYMGLGETSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, GLfloat *params); typedef void (APIENTRYP RGLSYMGLGETSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, GLuint *params); typedef void (APIENTRYP RGLSYMGLQUERYCOUNTERPROC) (GLuint id, GLenum target); +#ifndef OSX_10_6_SNOW_LEOPARD typedef void (APIENTRYP RGLSYMGLGETQUERYOBJECTI64VPROC) (GLuint id, GLenum pname, GLint64 *params); typedef void (APIENTRYP RGLSYMGLGETQUERYOBJECTUI64VPROC) (GLuint id, GLenum pname, GLuint64 *params); +#endif typedef void (APIENTRYP RGLSYMGLVERTEXP2UIPROC) (GLenum type, GLuint value); typedef void (APIENTRYP RGLSYMGLVERTEXP2UIVPROC) (GLenum type, const GLuint *value); typedef void (APIENTRYP RGLSYMGLVERTEXP3UIPROC) (GLenum type, GLuint value); @@ -798,7 +808,9 @@ typedef void (APIENTRYP RGLSYMGLDEPTHRANGEARRAYVPROC) (GLuint first, GLsizei cou typedef void (APIENTRYP RGLSYMGLDEPTHRANGEINDEXEDPROC) (GLuint index, GLdouble n, GLdouble f); typedef void (APIENTRYP RGLSYMGLGETFLOATI_VPROC) (GLenum target, GLuint index, GLfloat *data); typedef void (APIENTRYP RGLSYMGLGETDOUBLEI_VPROC) (GLenum target, GLuint index, GLdouble *data); +#ifndef OSX_10_6_SNOW_LEOPARD typedef GLsync (APIENTRYP RGLSYMGLCREATESYNCFROMCLEVENTARBPROC) (struct _cl_context * context, struct _cl_event * event, GLbitfield flags); +#endif typedef void (APIENTRYP RGLSYMGLDEBUGMESSAGECONTROLARBPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); typedef void (APIENTRYP RGLSYMGLDEBUGMESSAGEINSERTARBPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); typedef void (APIENTRYP RGLSYMGLDEBUGMESSAGECALLBACKARBPROC) (RGLGENGLDEBUGPROCARB callback, const GLvoid *userParam); @@ -859,7 +871,9 @@ typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBBINDINGPROC) (GLuint attribindex, GL typedef void (APIENTRYP RGLSYMGLVERTEXBINDINGDIVISORPROC) (GLuint bindingindex, GLuint divisor); typedef void (APIENTRYP RGLSYMGLFRAMEBUFFERPARAMETERIPROC) (GLenum target, GLenum pname, GLint param); typedef void (APIENTRYP RGLSYMGLGETFRAMEBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); +#ifndef OSX_10_6_SNOW_LEOPARD typedef void (APIENTRYP RGLSYMGLGETINTERNALFORMATI64VPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params); +#endif typedef void (APIENTRYP RGLSYMGLINVALIDATETEXSUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth); typedef void (APIENTRYP RGLSYMGLINVALIDATETEXIMAGEPROC) (GLuint texture, GLint level); typedef void (APIENTRYP RGLSYMGLINVALIDATEBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length); @@ -2324,8 +2338,10 @@ extern RGLSYMGLDRAWARRAYSINSTANCEDPROC __rglgen_glDrawArraysInstanced; extern RGLSYMGLDRAWELEMENTSINSTANCEDPROC __rglgen_glDrawElementsInstanced; extern RGLSYMGLTEXBUFFERPROC __rglgen_glTexBuffer; extern RGLSYMGLPRIMITIVERESTARTINDEXPROC __rglgen_glPrimitiveRestartIndex; +#ifndef OSX_10_6_SNOW_LEOPARD extern RGLSYMGLGETINTEGER64I_VPROC __rglgen_glGetInteger64i_v; extern RGLSYMGLGETBUFFERPARAMETERI64VPROC __rglgen_glGetBufferParameteri64v; +#endif extern RGLSYMGLFRAMEBUFFERTEXTUREPROC __rglgen_glFramebufferTexture; extern RGLSYMGLVERTEXATTRIBDIVISORPROC __rglgen_glVertexAttribDivisor; extern RGLSYMGLMINSAMPLESHADINGPROC __rglgen_glMinSampleShading; @@ -2584,6 +2600,7 @@ extern RGLSYMGLDRAWRANGEELEMENTSBASEVERTEXPROC __rglgen_glDrawRangeElementsBaseV extern RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC __rglgen_glDrawElementsInstancedBaseVertex; extern RGLSYMGLMULTIDRAWELEMENTSBASEVERTEXPROC __rglgen_glMultiDrawElementsBaseVertex; extern RGLSYMGLPROVOKINGVERTEXPROC __rglgen_glProvokingVertex; +#ifndef OSX_10_6_SNOW_LEOPARD extern RGLSYMGLFENCESYNCPROC __rglgen_glFenceSync; extern RGLSYMGLISSYNCPROC __rglgen_glIsSync; extern RGLSYMGLDELETESYNCPROC __rglgen_glDeleteSync; @@ -2591,6 +2608,7 @@ extern RGLSYMGLCLIENTWAITSYNCPROC __rglgen_glClientWaitSync; extern RGLSYMGLWAITSYNCPROC __rglgen_glWaitSync; extern RGLSYMGLGETINTEGER64VPROC __rglgen_glGetInteger64v; extern RGLSYMGLGETSYNCIVPROC __rglgen_glGetSynciv; +#endif extern RGLSYMGLTEXIMAGE2DMULTISAMPLEPROC __rglgen_glTexImage2DMultisample; extern RGLSYMGLTEXIMAGE3DMULTISAMPLEPROC __rglgen_glTexImage3DMultisample; extern RGLSYMGLGETMULTISAMPLEFVPROC __rglgen_glGetMultisamplefv; @@ -2623,8 +2641,10 @@ extern RGLSYMGLGETSAMPLERPARAMETERIIVPROC __rglgen_glGetSamplerParameterIiv; extern RGLSYMGLGETSAMPLERPARAMETERFVPROC __rglgen_glGetSamplerParameterfv; extern RGLSYMGLGETSAMPLERPARAMETERIUIVPROC __rglgen_glGetSamplerParameterIuiv; extern RGLSYMGLQUERYCOUNTERPROC __rglgen_glQueryCounter; +#ifndef OSX_10_6_SNOW_LEOPARD extern RGLSYMGLGETQUERYOBJECTI64VPROC __rglgen_glGetQueryObjecti64v; extern RGLSYMGLGETQUERYOBJECTUI64VPROC __rglgen_glGetQueryObjectui64v; +#endif extern RGLSYMGLVERTEXP2UIPROC __rglgen_glVertexP2ui; extern RGLSYMGLVERTEXP2UIVPROC __rglgen_glVertexP2uiv; extern RGLSYMGLVERTEXP3UIPROC __rglgen_glVertexP3ui; @@ -2792,7 +2812,9 @@ extern RGLSYMGLDEPTHRANGEARRAYVPROC __rglgen_glDepthRangeArrayv; extern RGLSYMGLDEPTHRANGEINDEXEDPROC __rglgen_glDepthRangeIndexed; extern RGLSYMGLGETFLOATI_VPROC __rglgen_glGetFloati_v; extern RGLSYMGLGETDOUBLEI_VPROC __rglgen_glGetDoublei_v; +#ifndef OSX_10_6_SNOW_LEOPARD extern RGLSYMGLCREATESYNCFROMCLEVENTARBPROC __rglgen_glCreateSyncFromCLeventARB; +#endif extern RGLSYMGLDEBUGMESSAGECONTROLARBPROC __rglgen_glDebugMessageControlARB; extern RGLSYMGLDEBUGMESSAGEINSERTARBPROC __rglgen_glDebugMessageInsertARB; extern RGLSYMGLDEBUGMESSAGECALLBACKARBPROC __rglgen_glDebugMessageCallbackARB; @@ -2853,7 +2875,9 @@ extern RGLSYMGLVERTEXATTRIBBINDINGPROC __rglgen_glVertexAttribBinding; extern RGLSYMGLVERTEXBINDINGDIVISORPROC __rglgen_glVertexBindingDivisor; extern RGLSYMGLFRAMEBUFFERPARAMETERIPROC __rglgen_glFramebufferParameteri; extern RGLSYMGLGETFRAMEBUFFERPARAMETERIVPROC __rglgen_glGetFramebufferParameteriv; +#ifndef OSX_10_6_SNOW_LEOPARD extern RGLSYMGLGETINTERNALFORMATI64VPROC __rglgen_glGetInternalformati64v; +#endif extern RGLSYMGLINVALIDATETEXSUBIMAGEPROC __rglgen_glInvalidateTexSubImage; extern RGLSYMGLINVALIDATETEXIMAGEPROC __rglgen_glInvalidateTexImage; extern RGLSYMGLINVALIDATEBUFFERSUBDATAPROC __rglgen_glInvalidateBufferSubData;