Fix forward compatible compatibility profiles.

The compatibility functions have not only been un-removed, but also
un-deprecated, so they should be present in the forward-compatible
compatibility profile.
This commit is contained in:
Matthias Bentrup 2015-02-11 09:48:53 +01:00 committed by Nigel Stewart
parent 99c107dd2f
commit 9367af5ed4
4 changed files with 83 additions and 75 deletions

View File

@ -42,6 +42,10 @@ sub make_condition($)
if ($needop) { if ($needop) {
$condition .= ' && '; $condition .= ' && ';
} }
if ($tok =~ /^!/) {
$condition .= '!';
$tok =~ s/^!//;
}
if ($tok =~ /^\d/) { if ($tok =~ /^\d/) {
# GL Version # GL Version
$tok =~ s/[.]/_/g; $tok =~ s/[.]/_/g;

View File

@ -35,6 +35,10 @@ sub make_pfn_def_init($%)
if ($needop) { if ($needop) {
$condition .= ' && '; $condition .= ' && ';
} }
if ($tok =~ /^!/) {
$condition .= '!';
$tok =~ s/^!//;
}
if ($tok =~ /^\d/) { if ($tok =~ /^\d/) {
# GL Version # GL Version
$tok =~ s/[.]/_/g; $tok =~ s/[.]/_/g;

View File

@ -100,7 +100,7 @@ http://www.opengl.org/documentation/specs/version1.3/glspec13.pdf
GL_CLAMP_TO_BORDER 0x812D GL_CLAMP_TO_BORDER 0x812D
void glActiveTexture (GLenum texture) void glActiveTexture (GLenum texture)
void glClientActiveTexture (GLenum texture) ~ 3.0 forward || 3.2 core void glClientActiveTexture (GLenum texture) ~ 3.0 forward !3.2 || 3.2 core
void glCompressedTexImage1D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data) 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 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 glCompressedTexImage3D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data)
@ -108,40 +108,40 @@ http://www.opengl.org/documentation/specs/version1.3/glspec13.pdf
void glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, 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 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 glGetCompressedTexImage (GLenum target, GLint lod, void *img)
void glLoadTransposeMatrixd (const GLdouble m[16]) ~ 3.0 forward || 3.2 core void glLoadTransposeMatrixd (const GLdouble m[16]) ~ 3.0 forward !3.2 || 3.2 core
void glLoadTransposeMatrixf (const GLfloat m[16]) ~ 3.0 forward || 3.2 core void glLoadTransposeMatrixf (const GLfloat m[16]) ~ 3.0 forward !3.2 || 3.2 core
void glMultTransposeMatrixd (const GLdouble m[16]) ~ 3.0 forward || 3.2 core void glMultTransposeMatrixd (const GLdouble m[16]) ~ 3.0 forward !3.2 || 3.2 core
void glMultTransposeMatrixf (const GLfloat m[16]) ~ 3.0 forward || 3.2 core void glMultTransposeMatrixf (const GLfloat m[16]) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord1d (GLenum target, GLdouble s) ~ 3.0 forward || 3.2 core void glMultiTexCoord1d (GLenum target, GLdouble s) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord1dv (GLenum target, const GLdouble *v) ~ 3.0 forward || 3.2 core void glMultiTexCoord1dv (GLenum target, const GLdouble *v) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord1f (GLenum target, GLfloat s) ~ 3.0 forward || 3.2 core void glMultiTexCoord1f (GLenum target, GLfloat s) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord1fv (GLenum target, const GLfloat *v) ~ 3.0 forward || 3.2 core void glMultiTexCoord1fv (GLenum target, const GLfloat *v) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord1i (GLenum target, GLint s) ~ 3.0 forward || 3.2 core void glMultiTexCoord1i (GLenum target, GLint s) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord1iv (GLenum target, const GLint *v) ~ 3.0 forward || 3.2 core void glMultiTexCoord1iv (GLenum target, const GLint *v) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord1s (GLenum target, GLshort s) ~ 3.0 forward || 3.2 core void glMultiTexCoord1s (GLenum target, GLshort s) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord1sv (GLenum target, const GLshort *v) ~ 3.0 forward || 3.2 core void glMultiTexCoord1sv (GLenum target, const GLshort *v) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord2d (GLenum target, GLdouble s, GLdouble t) ~ 3.0 forward || 3.2 core void glMultiTexCoord2d (GLenum target, GLdouble s, GLdouble t) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord2dv (GLenum target, const GLdouble *v) ~ 3.0 forward || 3.2 core void glMultiTexCoord2dv (GLenum target, const GLdouble *v) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord2f (GLenum target, GLfloat s, GLfloat t) ~ 3.0 forward || 3.2 core void glMultiTexCoord2f (GLenum target, GLfloat s, GLfloat t) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord2fv (GLenum target, const GLfloat *v) ~ 3.0 forward || 3.2 core void glMultiTexCoord2fv (GLenum target, const GLfloat *v) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord2i (GLenum target, GLint s, GLint t) ~ 3.0 forward || 3.2 core void glMultiTexCoord2i (GLenum target, GLint s, GLint t) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord2iv (GLenum target, const GLint *v) ~ 3.0 forward || 3.2 core void glMultiTexCoord2iv (GLenum target, const GLint *v) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord2s (GLenum target, GLshort s, GLshort t) ~ 3.0 forward || 3.2 core void glMultiTexCoord2s (GLenum target, GLshort s, GLshort t) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord2sv (GLenum target, const GLshort *v) ~ 3.0 forward || 3.2 core void glMultiTexCoord2sv (GLenum target, const GLshort *v) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord3d (GLenum target, GLdouble s, GLdouble t, GLdouble r) ~ 3.0 forward || 3.2 core void glMultiTexCoord3d (GLenum target, GLdouble s, GLdouble t, GLdouble r) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord3dv (GLenum target, const GLdouble *v) ~ 3.0 forward || 3.2 core void glMultiTexCoord3dv (GLenum target, const GLdouble *v) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord3f (GLenum target, GLfloat s, GLfloat t, GLfloat r) ~ 3.0 forward || 3.2 core void glMultiTexCoord3f (GLenum target, GLfloat s, GLfloat t, GLfloat r) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord3fv (GLenum target, const GLfloat *v) ~ 3.0 forward || 3.2 core void glMultiTexCoord3fv (GLenum target, const GLfloat *v) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord3i (GLenum target, GLint s, GLint t, GLint r) ~ 3.0 forward || 3.2 core void glMultiTexCoord3i (GLenum target, GLint s, GLint t, GLint r) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord3iv (GLenum target, const GLint *v) ~ 3.0 forward || 3.2 core void glMultiTexCoord3iv (GLenum target, const GLint *v) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord3s (GLenum target, GLshort s, GLshort t, GLshort r) ~ 3.0 forward || 3.2 core void glMultiTexCoord3s (GLenum target, GLshort s, GLshort t, GLshort r) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord3sv (GLenum target, const GLshort *v) ~ 3.0 forward || 3.2 core void glMultiTexCoord3sv (GLenum target, const GLshort *v) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord4d (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q) ~ 3.0 forward || 3.2 core void glMultiTexCoord4d (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord4dv (GLenum target, const GLdouble *v) ~ 3.0 forward || 3.2 core void glMultiTexCoord4dv (GLenum target, const GLdouble *v) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord4f (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q) ~ 3.0 forward || 3.2 core void glMultiTexCoord4f (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord4fv (GLenum target, const GLfloat *v) ~ 3.0 forward || 3.2 core void glMultiTexCoord4fv (GLenum target, const GLfloat *v) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord4i (GLenum target, GLint s, GLint t, GLint r, GLint q) ~ 3.0 forward || 3.2 core void glMultiTexCoord4i (GLenum target, GLint s, GLint t, GLint r, GLint q) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord4iv (GLenum target, const GLint *v) ~ 3.0 forward || 3.2 core void glMultiTexCoord4iv (GLenum target, const GLint *v) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord4s (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q) ~ 3.0 forward || 3.2 core void glMultiTexCoord4s (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q) ~ 3.0 forward !3.2 || 3.2 core
void glMultiTexCoord4sv (GLenum target, const GLshort *v) ~ 3.0 forward || 3.2 core void glMultiTexCoord4sv (GLenum target, const GLshort *v) ~ 3.0 forward !3.2 || 3.2 core
void glSampleCoverage (GLclampf value, GLboolean invert) void glSampleCoverage (GLclampf value, GLboolean invert)

View File

@ -43,48 +43,48 @@ http://www.opengl.org/documentation/specs/version1.4/glspec14.pdf
GL_MIRRORED_REPEAT 0x8370 GL_MIRRORED_REPEAT 0x8370
void glBlendEquation (GLenum mode) void glBlendEquation (GLenum mode)
void glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) void glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
void glFogCoordf (GLfloat coord) ~ 3.0 forward || 3.2 core void glFogCoordf (GLfloat coord) ~ 3.0 forward !3.2 || 3.2 core
void glFogCoordfv (const GLfloat *coord) ~ 3.0 forward || 3.2 core void glFogCoordfv (const GLfloat *coord) ~ 3.0 forward !3.2 || 3.2 core
void glFogCoordd (GLdouble coord) ~ 3.0 forward || 3.2 core void glFogCoordd (GLdouble coord) ~ 3.0 forward !3.2 || 3.2 core
void glFogCoorddv (const GLdouble *coord) ~ 3.0 forward || 3.2 core void glFogCoorddv (const GLdouble *coord) ~ 3.0 forward !3.2 || 3.2 core
void glFogCoordPointer (GLenum type, GLsizei stride, const void *pointer) ~ 3.0 forward || 3.2 core void glFogCoordPointer (GLenum type, GLsizei stride, const void *pointer) ~ 3.0 forward !3.2 || 3.2 core
void glMultiDrawArrays (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount) void glMultiDrawArrays (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
void glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const void *const* indices, GLsizei drawcount) void glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const void *const* indices, GLsizei drawcount)
void glPointParameteri (GLenum pname, GLint param) void glPointParameteri (GLenum pname, GLint param)
void glPointParameteriv (GLenum pname, const GLint *params) void glPointParameteriv (GLenum pname, const GLint *params)
void glPointParameterf (GLenum pname, GLfloat param) void glPointParameterf (GLenum pname, GLfloat param)
void glPointParameterfv (GLenum pname, const GLfloat *params) void glPointParameterfv (GLenum pname, const GLfloat *params)
void glSecondaryColor3b (GLbyte red, GLbyte green, GLbyte blue) ~ 3.0 forward || 3.2 core void glSecondaryColor3b (GLbyte red, GLbyte green, GLbyte blue) ~ 3.0 forward !3.2 || 3.2 core
void glSecondaryColor3bv (const GLbyte *v) ~ 3.0 forward || 3.2 core void glSecondaryColor3bv (const GLbyte *v) ~ 3.0 forward !3.2 || 3.2 core
void glSecondaryColor3d (GLdouble red, GLdouble green, GLdouble blue) ~ 3.0 forward || 3.2 core void glSecondaryColor3d (GLdouble red, GLdouble green, GLdouble blue) ~ 3.0 forward !3.2 || 3.2 core
void glSecondaryColor3dv (const GLdouble *v) ~ 3.0 forward || 3.2 core void glSecondaryColor3dv (const GLdouble *v) ~ 3.0 forward !3.2 || 3.2 core
void glSecondaryColor3f (GLfloat red, GLfloat green, GLfloat blue) ~ 3.0 forward || 3.2 core void glSecondaryColor3f (GLfloat red, GLfloat green, GLfloat blue) ~ 3.0 forward !3.2 || 3.2 core
void glSecondaryColor3fv (const GLfloat *v) ~ 3.0 forward || 3.2 core void glSecondaryColor3fv (const GLfloat *v) ~ 3.0 forward !3.2 || 3.2 core
void glSecondaryColor3i (GLint red, GLint green, GLint blue) ~ 3.0 forward || 3.2 core void glSecondaryColor3i (GLint red, GLint green, GLint blue) ~ 3.0 forward !3.2 || 3.2 core
void glSecondaryColor3iv (const GLint *v) ~ 3.0 forward || 3.2 core void glSecondaryColor3iv (const GLint *v) ~ 3.0 forward !3.2 || 3.2 core
void glSecondaryColor3s (GLshort red, GLshort green, GLshort blue) ~ 3.0 forward || 3.2 core void glSecondaryColor3s (GLshort red, GLshort green, GLshort blue) ~ 3.0 forward !3.2 || 3.2 core
void glSecondaryColor3sv (const GLshort *v) ~ 3.0 forward || 3.2 core void glSecondaryColor3sv (const GLshort *v) ~ 3.0 forward !3.2 || 3.2 core
void glSecondaryColor3ub (GLubyte red, GLubyte green, GLubyte blue) ~ 3.0 forward || 3.2 core void glSecondaryColor3ub (GLubyte red, GLubyte green, GLubyte blue) ~ 3.0 forward !3.2 || 3.2 core
void glSecondaryColor3ubv (const GLubyte *v) ~ 3.0 forward || 3.2 core void glSecondaryColor3ubv (const GLubyte *v) ~ 3.0 forward !3.2 || 3.2 core
void glSecondaryColor3ui (GLuint red, GLuint green, GLuint blue) ~ 3.0 forward || 3.2 core void glSecondaryColor3ui (GLuint red, GLuint green, GLuint blue) ~ 3.0 forward !3.2 || 3.2 core
void glSecondaryColor3uiv (const GLuint *v) ~ 3.0 forward || 3.2 core void glSecondaryColor3uiv (const GLuint *v) ~ 3.0 forward !3.2 || 3.2 core
void glSecondaryColor3us (GLushort red, GLushort green, GLushort blue) ~ 3.0 forward || 3.2 core void glSecondaryColor3us (GLushort red, GLushort green, GLushort blue) ~ 3.0 forward !3.2 || 3.2 core
void glSecondaryColor3usv (const GLushort *v) ~ 3.0 forward || 3.2 core void glSecondaryColor3usv (const GLushort *v) ~ 3.0 forward !3.2 || 3.2 core
void glSecondaryColorPointer (GLint size, GLenum type, GLsizei stride, const void *pointer) ~ 3.0 forward || 3.2 core void glSecondaryColorPointer (GLint size, GLenum type, GLsizei stride, const void *pointer) ~ 3.0 forward !3.2 || 3.2 core
void glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha) void glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
void glWindowPos2d (GLdouble x, GLdouble y) ~ 3.0 forward || 3.2 core void glWindowPos2d (GLdouble x, GLdouble y) ~ 3.0 forward !3.2 || 3.2 core
void glWindowPos2f (GLfloat x, GLfloat y) ~ 3.0 forward || 3.2 core void glWindowPos2f (GLfloat x, GLfloat y) ~ 3.0 forward !3.2 || 3.2 core
void glWindowPos2i (GLint x, GLint y) ~ 3.0 forward || 3.2 core void glWindowPos2i (GLint x, GLint y) ~ 3.0 forward !3.2 || 3.2 core
void glWindowPos2s (GLshort x, GLshort y) ~ 3.0 forward || 3.2 core void glWindowPos2s (GLshort x, GLshort y) ~ 3.0 forward !3.2 || 3.2 core
void glWindowPos2dv (const GLdouble *p) ~ 3.0 forward || 3.2 core void glWindowPos2dv (const GLdouble *p) ~ 3.0 forward !3.2 || 3.2 core
void glWindowPos2fv (const GLfloat *p) ~ 3.0 forward || 3.2 core void glWindowPos2fv (const GLfloat *p) ~ 3.0 forward !3.2 || 3.2 core
void glWindowPos2iv (const GLint *p) ~ 3.0 forward || 3.2 core void glWindowPos2iv (const GLint *p) ~ 3.0 forward !3.2 || 3.2 core
void glWindowPos2sv (const GLshort *p) ~ 3.0 forward || 3.2 core void glWindowPos2sv (const GLshort *p) ~ 3.0 forward !3.2 || 3.2 core
void glWindowPos3d (GLdouble x, GLdouble y, GLdouble z) ~ 3.0 forward || 3.2 core void glWindowPos3d (GLdouble x, GLdouble y, GLdouble z) ~ 3.0 forward !3.2 || 3.2 core
void glWindowPos3f (GLfloat x, GLfloat y, GLfloat z) ~ 3.0 forward || 3.2 core void glWindowPos3f (GLfloat x, GLfloat y, GLfloat z) ~ 3.0 forward !3.2 || 3.2 core
void glWindowPos3i (GLint x, GLint y, GLint z) ~ 3.0 forward || 3.2 core void glWindowPos3i (GLint x, GLint y, GLint z) ~ 3.0 forward !3.2 || 3.2 core
void glWindowPos3s (GLshort x, GLshort y, GLshort z) ~ 3.0 forward || 3.2 core void glWindowPos3s (GLshort x, GLshort y, GLshort z) ~ 3.0 forward !3.2 || 3.2 core
void glWindowPos3dv (const GLdouble *p) ~ 3.0 forward || 3.2 core void glWindowPos3dv (const GLdouble *p) ~ 3.0 forward !3.2 || 3.2 core
void glWindowPos3fv (const GLfloat *p) ~ 3.0 forward || 3.2 core void glWindowPos3fv (const GLfloat *p) ~ 3.0 forward !3.2 || 3.2 core
void glWindowPos3iv (const GLint *p) ~ 3.0 forward || 3.2 core void glWindowPos3iv (const GLint *p) ~ 3.0 forward !3.2 || 3.2 core
void glWindowPos3sv (const GLshort *p) ~ 3.0 forward || 3.2 core void glWindowPos3sv (const GLshort *p) ~ 3.0 forward !3.2 || 3.2 core