summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2012-02-08 13:04:38 -0800
committerIan Romanick <ian.d.romanick@intel.com>2012-02-15 14:51:26 -0800
commitefca49fd513dd7504a07368c61e7198cfebe24a9 (patch)
tree554127addde880511c3335ec51ecff92cdcb5cd3
parentd45a5fde45e30c4475a92217b582c73d8ef5f52b (diff)
glapi: Include GLES2 headers for ES2 extension functions
This fixes build errors like In file included from glapi_dispatch.c:91: ../../../src/mapi/glapi/glapitemp.h:4641: error: no previous prototype for 'glDrawBuffersNV' Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Tested-by: Lucas Stach <dev@lynxeye.de> (cherry picked from commit 8f3be339850ead96f9c6200db4e0db1f74e39d13)
-rw-r--r--src/mapi/glapi/glapi_priv.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/mapi/glapi/glapi_priv.h b/src/mapi/glapi/glapi_priv.h
index 3ab553a2b8d..b6600c5fc9a 100644
--- a/src/mapi/glapi/glapi_priv.h
+++ b/src/mapi/glapi/glapi_priv.h
@@ -38,6 +38,16 @@
#include "GL/gl.h"
#include "GL/glext.h"
+/* The define of GL_COVERAGE_SAMPLES_NV in gl2ext.h is guarded by a different
+ * extension (GL_NV_coverage_sample) than in glext.h
+ * (GL_NV_multisample_coverage). Just undefine it to avoid spurious compiler
+ * warnings.
+ */
+#undef GL_COVERAGE_SAMPLES_NV
+
+#include "GLES2/gl2platform.h"
+#include "GLES2/gl2ext.h"
+
#ifndef GL_OES_fixed_point
typedef int GLfixed;
typedef int GLclampx;