diff options
| author | Jesse Hall <jessehall@google.com> | 2013-02-23 04:56:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-23 04:56:32 +0000 |
| commit | 751402c866968204af050f95d14a38cb3c3fa134 (patch) | |
| tree | cade947c28e70912d4849524b938b56354981813 /opengl/libs/GLES_trace | |
| parent | 0f589bedca4f6c84d304126cb0b83a064f391a33 (diff) | |
| parent | d58974c6b25fe9fdadb38dc1f1371196b71a0913 (diff) | |
| download | frameworks_native-751402c866968204af050f95d14a38cb3c3fa134.zip frameworks_native-751402c866968204af050f95d14a38cb3c3fa134.tar.gz frameworks_native-751402c866968204af050f95d14a38cb3c3fa134.tar.bz2 | |
Merge changes I45836219,I70a4075e
* changes:
Regenerate API/trace files for constness change
Import constness fix from gl3.h into gl2.h.
Diffstat (limited to 'opengl/libs/GLES_trace')
| -rw-r--r-- | opengl/libs/GLES_trace/src/gltrace_api.cpp | 2 | ||||
| -rw-r--r-- | opengl/libs/GLES_trace/src/gltrace_api.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/opengl/libs/GLES_trace/src/gltrace_api.cpp b/opengl/libs/GLES_trace/src/gltrace_api.cpp index 2ae4b11..d7ab3c3 100644 --- a/opengl/libs/GLES_trace/src/gltrace_api.cpp +++ b/opengl/libs/GLES_trace/src/gltrace_api.cpp @@ -3839,7 +3839,7 @@ void GLTrace_glShaderBinary(GLsizei n, const GLuint* shaders, GLenum binaryforma glContext->traceGLMessage(&glmsg); } -void GLTrace_glShaderSource(GLuint shader, GLsizei count, const GLchar** string, const GLint* length) { +void GLTrace_glShaderSource(GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length) { GLMessage glmsg; GLTraceContext *glContext = getGLTraceContext(); diff --git a/opengl/libs/GLES_trace/src/gltrace_api.h b/opengl/libs/GLES_trace/src/gltrace_api.h index 309afcb..64c6e9a 100644 --- a/opengl/libs/GLES_trace/src/gltrace_api.h +++ b/opengl/libs/GLES_trace/src/gltrace_api.h @@ -119,7 +119,7 @@ void GLTrace_glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei void GLTrace_glSampleCoverage(GLclampf value, GLboolean invert); void GLTrace_glScissor(GLint x, GLint y, GLsizei width, GLsizei height); void GLTrace_glShaderBinary(GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length); -void GLTrace_glShaderSource(GLuint shader, GLsizei count, const GLchar** string, const GLint* length); +void GLTrace_glShaderSource(GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length); void GLTrace_glStencilFunc(GLenum func, GLint ref, GLuint mask); void GLTrace_glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask); void GLTrace_glStencilMask(GLuint mask); |