[cogl] Move GLES2 prototypes to their header
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl] Move GLES2 prototypes to their header
- Date: Fri, 27 Jan 2012 16:39:08 +0000 (UTC)
commit 417878538b44d0dcdb86335d18dddbcd5658715f
Author: Emmanuele Bassi <ebassi linux intel com>
Date: Fri Jan 27 16:34:11 2012 +0000
Move GLES2 prototypes to their header
Some GLSL-related function prototypes are GLES2-only: GL implementations
are not required to provide them.
While Mesa is perfectly happy to return a dummy function pointer for
functions it doesn't support, other platforms are more picky, and will
return NULL.
In this particular case, this commit fixes GLSL support on OSX.
https://bugzilla.gnome.org/show_bug.cgi?id=668856
Reviewed-by: Neil Roberts <neil linux intel com>
cogl/gl-prototypes/cogl-glsl-functions.h | 11 -----------
cogl/gl-prototypes/cogl-in-gles2-core-functions.h | 11 +++++++++++
2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/cogl/gl-prototypes/cogl-glsl-functions.h b/cogl/gl-prototypes/cogl-glsl-functions.h
index b0eff7e..a2b7abc 100644
--- a/cogl/gl-prototypes/cogl-glsl-functions.h
+++ b/cogl/gl-prototypes/cogl-glsl-functions.h
@@ -258,11 +258,6 @@ COGL_EXT_FUNCTION (void, glGetAttachedShaders,
GLsizei maxcount,
GLsizei* count,
GLuint* shaders))
-COGL_EXT_FUNCTION (void, glGetShaderPrecisionFormat,
- (GLenum shadertype,
- GLenum precisiontype,
- GLint* range,
- GLint* precision))
COGL_EXT_FUNCTION (void, glGetShaderSource,
(GLuint shader,
GLsizei bufsize,
@@ -274,12 +269,6 @@ COGL_EXT_FUNCTION (GLboolean, glIsShader,
COGL_EXT_FUNCTION (GLboolean, glIsProgram,
(GLuint program))
-COGL_EXT_FUNCTION (void, glShaderBinary,
- (GLsizei n,
- const GLuint* shaders,
- GLenum binaryformat,
- const GLvoid* binary,
- GLsizei length))
COGL_EXT_FUNCTION (void, glValidateProgram, (GLuint program))
COGL_EXT_END ()
diff --git a/cogl/gl-prototypes/cogl-in-gles2-core-functions.h b/cogl/gl-prototypes/cogl-in-gles2-core-functions.h
index 2157cd9..f39bd27 100644
--- a/cogl/gl-prototypes/cogl-in-gles2-core-functions.h
+++ b/cogl/gl-prototypes/cogl-in-gles2-core-functions.h
@@ -151,6 +151,17 @@ COGL_EXT_BEGIN (gles2_only_api,
"\0",
"\0")
COGL_EXT_FUNCTION (void, glReleaseShaderCompiler, (void))
+COGL_EXT_FUNCTION (void, glGetShaderPrecisionFormat,
+ (GLenum shadertype,
+ GLenum precisiontype,
+ GLint* range,
+ GLint* precision))
+COGL_EXT_FUNCTION (void, glShaderBinary,
+ (GLsizei n,
+ const GLuint* shaders,
+ GLenum binaryformat,
+ const GLvoid* binary,
+ GLsizei length))
COGL_EXT_END ()
/* GL and GLES 2.0 apis */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]