From 63faf7de619be093c883318e90b5e317b9cb0eb1 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 12 Sep 2016 13:26:40 +0100 Subject: Remove GL_GLEXT_PROTOTYPES guards from non-ext headers. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A earlier sync with the Khronos headers added _extension_ prototype guards to all the GLES2/3/31/32 core entry points. Effectively breaking all the applications that aim to be portable and do not set the define. The issue has been reported to Khronos (internal bugzilla #14206) and is being worked on. Until updated/fixed headers are released locally fix the issue. The following report is when building weston. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97773 Cc: Armin Krezović Cc: Emmanuel Gil Peyrot Cc: Pekka Paalanen Fixes: 6a5504de2fb ("Update Khronos-supplied headers to r33100") Cc: Dave Airlie Signed-off-by: Emil Velikov Reviewed-by: Daniel Stone Reviewed-by: Ilia Mirkin --- include/GLES2/gl2.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/GLES2/gl2.h') diff --git a/include/GLES2/gl2.h b/include/GLES2/gl2.h index 27ecbd8e201..57e1b50ccc7 100644 --- a/include/GLES2/gl2.h +++ b/include/GLES2/gl2.h @@ -520,7 +520,6 @@ typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GL typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v); typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer); typedef void (GL_APIENTRYP PFNGLVIEWPORTPROC) (GLint x, GLint y, GLsizei width, GLsizei height); -#ifdef GL_GLEXT_PROTOTYPES GL_APICALL void GL_APIENTRY glActiveTexture (GLenum texture); GL_APICALL void GL_APIENTRY glAttachShader (GLuint program, GLuint shader); GL_APICALL void GL_APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar *name); @@ -663,7 +662,6 @@ GL_APICALL void GL_APIENTRY glVertexAttrib4f (GLuint index, GLfloat x, GLfloat y GL_APICALL void GL_APIENTRY glVertexAttrib4fv (GLuint index, const GLfloat *v); GL_APICALL void GL_APIENTRY glVertexAttribPointer (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer); GL_APICALL void GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height); -#endif #endif /* GL_ES_VERSION_2_0 */ #ifdef __cplusplus -- cgit v1.2.3