summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2010-11-04 19:59:39 +0100
committerSven Gothel <[email protected]>2010-11-04 19:59:39 +0100
commit5c6ae60c53257169edcb888c4116fbf7c56d6956 (patch)
treefbbd0de83eb82eb316551bd54b668d3c0fcfdc33 /make
parentb601c33cc59a3c0a8654c46960b8d8c23a2face2 (diff)
Adding patches for gluegen interoperability and adding some extensions:
- gl2.h: adding ifndef core extension and profiles for gluegen
Diffstat (limited to 'make')
-rw-r--r--make/stub_includes/opengl/GLES2/gl2.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/make/stub_includes/opengl/GLES2/gl2.h b/make/stub_includes/opengl/GLES2/gl2.h
index e1d3b87cc..f9ac07385 100644
--- a/make/stub_includes/opengl/GLES2/gl2.h
+++ b/make/stub_includes/opengl/GLES2/gl2.h
@@ -39,7 +39,7 @@ typedef khronos_intptr_t GLintptr;
typedef khronos_ssize_t GLsizeiptr;
/* OpenGL ES core versions */
-#define GL_ES_VERSION_2_0 1
+#ifndef GL_ES_VERSION_2_0
/* ClearBufferMask */
#define GL_DEPTH_BUFFER_BIT 0x00000100
@@ -467,10 +467,15 @@ typedef khronos_ssize_t GLsizeiptr;
#define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506
+#endif /* GL_ES_VERSION_2_0 */
+
/*-------------------------------------------------------------------------
* GL core functions.
*-----------------------------------------------------------------------*/
+#ifndef GL_ES_VERSION_2_0
+#define GL_ES_VERSION_2_0 1
+
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);
@@ -614,6 +619,8 @@ GL_APICALL void GL_APIENTRY glVertexAttrib4fv (GLuint indx, const GLfloa
GL_APICALL void GL_APIENTRY glVertexAttribPointer (GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* ptr);
GL_APICALL void GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
+#endif /* GL_ES_VERSION_2_0 */
+
#ifdef __cplusplus
}
#endif