Commit 6665fe36 authored by Glen Gray's avatar Glen Gray Committed by Jean-Paul Saman

Mesa recently updated the <GL/glext.h> header version to Khronos version 85.

This caused the PFNGLMULTITEXCOORD2FPROC definition to be moved out of the
GL_VERSION_1_3_DEPRECATED block. However, since <GL/gl.h> also defines
GL_VERSION_1_3 to 1, the definitions in <GL/glext.h> are then not enabled,
thus leaving PFNGLMULTITEXCOORD2FPROC undefined as well.

Provide a PFNGLMULTITEXCOORD2FPROC replacement as an interim solution for
newer versions of the <GL/glext.h> header.

Patch taken from: http://gitorious.org/vaapi/gstreamer-vaapi/commit/5db2e93d3c930fd8470cfdcd26f514d1cebc59a0?format=patchSigned-off-by: default avatarJean-Paul Saman <jpsaman@videolan.org>
parent 59490ff3
...@@ -25,6 +25,13 @@ ...@@ -25,6 +25,13 @@
#include <GL/glext.h> #include <GL/glext.h>
#include <GL/glx.h> #include <GL/glx.h>
#if GL_GLEXT_VERSION >= 85
/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED
block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h>
Redefine the type here as an interim solution */
typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
#endif
#ifndef GL_FRAMEBUFFER_BINDING #ifndef GL_FRAMEBUFFER_BINDING
#define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_EXT #define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_EXT
#endif #endif
...@@ -44,6 +51,7 @@ ...@@ -44,6 +51,7 @@
#define GL_PROGRAM_UNDER_NATIVE_LIMITS GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB #define GL_PROGRAM_UNDER_NATIVE_LIMITS GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB
#endif #endif
const char * const char *
gl_get_error_string(GLenum error) gl_get_error_string(GLenum error)
attribute_hidden; attribute_hidden;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment