From: Brian <brian@yutani.localnet.net>
Date: Sat, 19 May 2007 14:56:15 +0000 (-0600)
Subject: Disable (at least for now) PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC typedef.
X-Git-Tag: 062012170305~19327^2~99
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=74519c42311c67a2f914768abbe905d321702386;p=profile%2Fivi%2Fmesa.git

Disable (at least for now) PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC typedef.

If an app (like progs/samples/blendxor.c) includes both gl.h and glext.h
this typedef will get hit in both headers, causing an error.
Possibly work around by bringing GL_NV_geometry_program4 items into gl.h.
---

diff --git a/include/GL/gl.h b/include/GL/gl.h
index 6e92481..a388de3 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -2221,8 +2221,13 @@ GLAPI void APIENTRY glFramebufferTextureLayerEXT(GLenum target,
     GLenum attachment, GLuint texture, GLint level, GLint layer);
 #endif /* GL_GLEXT_PROTOTYPES */
 
+#if 0
+/* (temporarily) disabled because of collision with typedef in glext.h
+ * that happens if apps include both gl.h and glext.h
+ */
 typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target,
     GLenum attachment, GLuint texture, GLint level, GLint layer);
+#endif
 
 #define GL_TEXTURE_1D_ARRAY_EXT         0x8C18
 #define GL_PROXY_TEXTURE_1D_ARRAY_EXT   0x8C19