From 3ed8d4285360047d78cfd3218ac4f8f325ae5d6e Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Tue, 3 Jul 2012 20:47:04 -0400 Subject: GLES2: upgrade gl2ext.h to version 18099 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Redo this commit, and remove the inclusion of gl2ext.h from src/mapi/glapi/glapi_priv.h. The include was added in 8f3be339850ead96f9c6200db4e0db1f74e39d13 to fix a missing prototype for glDrawBuffersNV and others, but it's not possible to include both glext.h and gl2ext.h from the same file. I don't see the missing prototype here (with or without shared glapi) so I'm just removing the offending #include. Also, since we're redoing this, update to the most recent gl2ext.2. Signed-off-by: Kristian Høgsberg --- src/mapi/glapi/glapi_priv.h | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/mapi/glapi/glapi_priv.h') diff --git a/src/mapi/glapi/glapi_priv.h b/src/mapi/glapi/glapi_priv.h index b6600c5fc9a..3ab553a2b8d 100644 --- a/src/mapi/glapi/glapi_priv.h +++ b/src/mapi/glapi/glapi_priv.h @@ -38,16 +38,6 @@ #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; -- cgit v1.2.3