diff options
| author | Alistair Strachan <alistair.strachan@imgtec.com> | 2013-01-21 11:24:32 -0800 |
|---|---|---|
| committer | Jesse Hall <jessehall@google.com> | 2013-02-11 16:12:49 -0800 |
| commit | 7c95911157999d30fbadf8f964155396d17c49da (patch) | |
| tree | 419c618b377315d8b9c5b77455456b508267a26f /opengl/include | |
| parent | 2b6694f5f0106b535bf9188262ca8ca72278e906 (diff) | |
| download | frameworks_native-7c95911157999d30fbadf8f964155396d17c49da.zip frameworks_native-7c95911157999d30fbadf8f964155396d17c49da.tar.gz frameworks_native-7c95911157999d30fbadf8f964155396d17c49da.tar.bz2 | |
Import constness fix from gl3.h into gl2.h.
This change has been made in Khronos SVN for GLES2 already, however it
is mildly controversial and discussion is on-going.
This change is necessary for Android because otherwise applications
cannot include both GLES2/gl2.h and GLES3/gl3.h as the glShaderSource()
prototype mismatches. Native programs may include framework headers
(which now include GLES3 headers only) but already have included GLES2
headers, creating an incompatibility.
Change-Id: I70a4075e079ee063e76cef5a227abb0ae70aebb4
Diffstat (limited to 'opengl/include')
| -rw-r--r-- | opengl/include/GLES2/gl2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/include/GLES2/gl2.h b/opengl/include/GLES2/gl2.h index c139c25..d16f895 100644 --- a/opengl/include/GLES2/gl2.h +++ b/opengl/include/GLES2/gl2.h @@ -569,7 +569,7 @@ GL_APICALL void GL_APIENTRY glRenderbufferStorage (GLenum target, GLenum GL_APICALL void GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert); GL_APICALL void GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height); GL_APICALL void GL_APIENTRY glShaderBinary (GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length); -GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar** string, const GLint* length); +GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length); GL_APICALL void GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask); GL_APICALL void GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask); GL_APICALL void GL_APIENTRY glStencilMask (GLuint mask); |