From 59758a8a9e732dfda83b87fb0082af3c924d3530 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Wed, 7 Aug 2013 12:05:08 -0700 Subject: [PATCH] Add workaround for broken GL_EXT_unpack_subimage tokens Earlier versions of gl2ext.h defined the GL_EXT_unpack_subimage tokens without the _EXT suffix. That's been fixed and we're using the _EXT tokens now, but just in case we're using an older, broken header, define the _EXT tokens manually. --- src/weston-egl-ext.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/weston-egl-ext.h b/src/weston-egl-ext.h index fe02368..6aa49fd 100644 --- a/src/weston-egl-ext.h +++ b/src/weston-egl-ext.h @@ -62,4 +62,15 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYWAYLANDBUFFERWL) (EGLDisplay dpy, st #define EGL_BUFFER_AGE_EXT 0x313D #endif +/* Mesas gl2ext.h and probably Khronos upstream defined + * GL_EXT_unpack_subimage with non _EXT suffixed GL_UNPACK_* tokens. + * In case we're using that mess, manually define the _EXT versions + * of the tokens here.*/ +#if defined(GL_EXT_unpack_subimage) && !defined(GL_UNPACK_ROW_LENGTH_EXT) +#define GL_UNPACK_ROW_LENGTH_EXT 0x0CF2 +#define GL_UNPACK_SKIP_ROWS_EXT 0x0CF3 +#define GL_UNPACK_SKIP_PIXELS_EXT 0x0CF4 +#endif + + #endif -- 2.7.4