Mesa (8.0): glapi: Include GLES2 headers for ES2 extension functions
Ian Romanick
idr at kemper.freedesktop.org
Wed Feb 15 22:52:46 UTC 2012
Module: Mesa
Branch: 8.0
Commit: efca49fd513dd7504a07368c61e7198cfebe24a9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=efca49fd513dd7504a07368c61e7198cfebe24a9
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Wed Feb 8 13:04:38 2012 -0800
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 at intel.com>
Tested-by: Lucas Stach <dev at lynxeye.de>
(cherry picked from commit 8f3be339850ead96f9c6200db4e0db1f74e39d13)
---
src/mapi/glapi/glapi_priv.h | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/mapi/glapi/glapi_priv.h b/src/mapi/glapi/glapi_priv.h
index 3ab553a..b6600c5 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;
More information about the mesa-commit
mailing list