Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 751402c8 authored by Jesse Hall's avatar Jesse Hall Committed by Android (Google) Code Review
Browse files

Merge changes I45836219,I70a4075e 

* changes:
  Regenerate API/trace files for constness change
  Import constness fix from gl3.h into gl2.h.
parents 0f589bed d58974c6

opengl/include/GLES2/gl2.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

opengl/libs/GLES2/gl2_api.in

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ void API_ENTRY(glScissor)(GLint x, GLint y, GLsizei width, GLsizei height) { 
void API_ENTRY(glShaderBinary)(GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length) {

    CALL_GL_API(glShaderBinary, n, shaders, binaryformat, binary, length);

}

void API_ENTRY(glShaderSource)(GLuint shader, GLsizei count, const GLchar** string, const GLint* length) {

void API_ENTRY(glShaderSource)(GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length) {

    CALL_GL_API(glShaderSource, shader, count, string, length);

}

void API_ENTRY(glStencilFunc)(GLenum func, GLint ref, GLuint mask) {

opengl/libs/GLES_trace/src/gltrace_api.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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();















































opengl/libs/GLES_trace/src/gltrace_api.h



+1
−1




























Original line number
Diff line number
Diff line








@@ -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);

































opengl/libs/entries.in



+1
−1




























Original line number
Diff line number
Diff line








@@ -354,7 +354,7 @@ GL_ENTRY(void, glSelectPerfMonitorCountersAMD, GLuint monitor, GLboolean enable,













GL_ENTRY(void, glSetFenceNV, GLuint fence, GLenum condition)















GL_ENTRY(void, glShadeModel, GLenum mode)















GL_ENTRY(void, glShaderBinary, GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length)













GL_ENTRY(void, glShaderSource, GLuint shader, GLsizei count, const GLchar** string, const GLint* length)













GL_ENTRY(void, glShaderSource, GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length)















GL_ENTRY(void, glStartTilingQCOM, GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask)















GL_ENTRY(void, glStencilFunc, GLenum func, GLint ref, GLuint mask)















GL_ENTRY(void, glStencilFuncSeparate, GLenum face, GLenum func, GLint ref, GLuint mask)