On 12/11/2013 12:03 PM, Keith Packard wrote:
These are duplicates from gl.h; I'm not sure which file they belong in, but
you don't get to have them in both places.

Signed-off-by: Keith Packard <kei...@keithp.com>
---
  include/GL/glext.h | 2 --
  1 file changed, 2 deletions(-)

diff --git a/include/GL/glext.h b/include/GL/glext.h
index fea9e1f..4c0a373 100644
--- a/include/GL/glext.h
+++ b/include/GL/glext.h
@@ -457,8 +457,6 @@ GLAPI void APIENTRY glWindowPos3i (GLint x, GLint y, GLint 
z);
  GLAPI void APIENTRY glWindowPos3iv (const GLint *v);
  GLAPI void APIENTRY glWindowPos3s (GLshort x, GLshort y, GLshort z);
  GLAPI void APIENTRY glWindowPos3sv (const GLshort *v);
-GLAPI void APIENTRY glBlendColor (GLfloat red, GLfloat green, GLfloat blue, 
GLfloat alpha);
-GLAPI void APIENTRY glBlendEquation (GLenum mode);
  #endif
  #endif /* GL_VERSION_1_4 */



Hmm. glext.h comes from Khronos and we try not to make any local modifications to it. The next time we import the newest glext.h this change would likely get lost.

I'm also hesitant to remove it from gl.h since legacy GL 1.x apps might not compile without those prototypes. Note that prototypes in glext.h are protected by GL_GLEXT_PROTOTYPES and normally not enabled.

Are you seeing some compiler warnings or something?

-Brian

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to