summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGwenole Beauchesne <gwenole.beauchesne@intel.com>2012-09-27 11:04:24 +0200
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>2012-09-27 11:04:24 +0200
commit5db2e93d3c930fd8470cfdcd26f514d1cebc59a0 (patch)
tree99b0d76390dda262a909ddb7799fb3811f320465
parent10ee14cc9c4479bf8f6244623fd096d006dc8970 (diff)
utils: fix build with <GL/glext.h> version >= 85.
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.
-rw-r--r--gst-libs/gst/vaapi/gstvaapiutils_glx.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/gst-libs/gst/vaapi/gstvaapiutils_glx.h b/gst-libs/gst/vaapi/gstvaapiutils_glx.h
index c9a49833..5eb5d935 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_glx.h
+++ b/gst-libs/gst/vaapi/gstvaapiutils_glx.h
@@ -41,6 +41,13 @@ typedef GLXPixmap (*PFNGLXCREATEPIXMAPPROC)(Display *, GLXFBConfig, Pixmap, cons
typedef void (*PFNGLXDESTROYPIXMAPPROC)(Display *, GLXPixmap);
#endif
+#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
#define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_EXT
#endif