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

Commit 5e530e02 authored by Andrew Hsieh's avatar Andrew Hsieh Committed by Android Git Automerger
Browse files

am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation" 

* commit 'a151a19d':
  Fix return type of glGetAttribLocation and glGetUniformLocation
parents e2d4cc28 a151a19d

opengl/include/GLES2/gl2.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -528,7 +528,7 @@ GL_APICALL void GL_APIENTRY glGenTextures (GLsizei n, GLuint* textures); 
GL_APICALL void         GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);

GL_APICALL void         GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);

GL_APICALL void         GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);

GL_APICALL void         GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);

GL_APICALL void         GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);

GL_APICALL void         GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);

GL_APICALL int          GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name);

GL_APICALL GLint        GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name);

GL_APICALL void         GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean* params);

GL_APICALL void         GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean* params);

GL_APICALL void         GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params);

GL_APICALL void         GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params);

GL_APICALL GLenum       GL_APIENTRY glGetError (void);

GL_APICALL GLenum       GL_APIENTRY glGetError (void);
@@ -547,7 +547,7 @@ GL_APICALL void GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum p 
GL_APICALL void         GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint* params);

GL_APICALL void         GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint* params);

GL_APICALL void         GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat* params);

GL_APICALL void         GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat* params);

GL_APICALL void         GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint* params);

GL_APICALL void         GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint* params);

GL_APICALL int          GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name);

GL_APICALL GLint        GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name);

GL_APICALL void         GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat* params);

GL_APICALL void         GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat* params);

GL_APICALL void         GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint* params);

GL_APICALL void         GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint* params);

GL_APICALL void         GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid** pointer);

GL_APICALL void         GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid** pointer);

opengl/libs/GLES2/gl2_api.in

+2 −2
Original line number Original line Diff line number Diff line
@@ -169,7 +169,7 @@ void API_ENTRY(glGetActiveUniform)(GLuint program, GLuint index, GLsizei bufsize 
void API_ENTRY(glGetAttachedShaders)(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders) {

void API_ENTRY(glGetAttachedShaders)(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders) {

    CALL_GL_API(glGetAttachedShaders, program, maxcount, count, shaders);

    CALL_GL_API(glGetAttachedShaders, program, maxcount, count, shaders);

}

}

int API_ENTRY(glGetAttribLocation)(GLuint program, const GLchar* name) {

GLint API_ENTRY(glGetAttribLocation)(GLuint program, const GLchar* name) {

    CALL_GL_API_RETURN(glGetAttribLocation, program, name);

    CALL_GL_API_RETURN(glGetAttribLocation, program, name);

}

}

void API_ENTRY(glGetBooleanv)(GLenum pname, GLboolean* params) {

void API_ENTRY(glGetBooleanv)(GLenum pname, GLboolean* params) {
@@ -226,7 +226,7 @@ void API_ENTRY(glGetUniformfv)(GLuint program, GLint location, GLfloat* params) 
void API_ENTRY(glGetUniformiv)(GLuint program, GLint location, GLint* params) {

void API_ENTRY(glGetUniformiv)(GLuint program, GLint location, GLint* params) {

    CALL_GL_API(glGetUniformiv, program, location, params);

    CALL_GL_API(glGetUniformiv, program, location, params);

}

}

int API_ENTRY(glGetUniformLocation)(GLuint program, const GLchar* name) {

GLint API_ENTRY(glGetUniformLocation)(GLuint program, const GLchar* name) {

    CALL_GL_API_RETURN(glGetUniformLocation, program, name);

    CALL_GL_API_RETURN(glGetUniformLocation, program, name);

}

}

void API_ENTRY(glGetVertexAttribfv)(GLuint index, GLenum pname, GLfloat* params) {

void API_ENTRY(glGetVertexAttribfv)(GLuint index, GLenum pname, GLfloat* params) {

opengl/libs/GLES_trace/src/gltrace_api.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -2214,7 +2214,7 @@ void GLTrace_glGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* cou 
    glContext->traceGLMessage(&glmsg);

    glContext->traceGLMessage(&glmsg);

}

}

















int GLTrace_glGetAttribLocation(GLuint program, const GLchar* name) {







GLint GLTrace_glGetAttribLocation(GLuint program, const GLchar* name) {











    GLMessage glmsg;







    GLMessage glmsg;











    GLTraceContext *glContext = getGLTraceContext();







    GLTraceContext *glContext = getGLTraceContext();

























@@ -2235,7 +2235,7 @@ int GLTrace_glGetAttribLocation(GLuint program, const GLchar* name) {









    // call function







    // call function











    nsecs_t wallStartTime = systemTime(SYSTEM_TIME_MONOTONIC);







    nsecs_t wallStartTime = systemTime(SYSTEM_TIME_MONOTONIC);











    nsecs_t threadStartTime = systemTime(SYSTEM_TIME_THREAD);







    nsecs_t threadStartTime = systemTime(SYSTEM_TIME_THREAD);











    int retValue = glContext->hooks->gl.glGetAttribLocation(program, name);







    GLint retValue = glContext->hooks->gl.glGetAttribLocation(program, name);











    nsecs_t threadEndTime = systemTime(SYSTEM_TIME_THREAD);







    nsecs_t threadEndTime = systemTime(SYSTEM_TIME_THREAD);











    nsecs_t wallEndTime = systemTime(SYSTEM_TIME_MONOTONIC);







    nsecs_t wallEndTime = systemTime(SYSTEM_TIME_MONOTONIC);


























@@ -2996,7 +2996,7 @@ void GLTrace_glGetUniformiv(GLuint program, GLint location, GLint* params) {









    glContext->traceGLMessage(&glmsg);







    glContext->traceGLMessage(&glmsg);











}







}



























int GLTrace_glGetUniformLocation(GLuint program, const GLchar* name) {







GLint GLTrace_glGetUniformLocation(GLuint program, const GLchar* name) {











    GLMessage glmsg;







    GLMessage glmsg;











    GLTraceContext *glContext = getGLTraceContext();







    GLTraceContext *glContext = getGLTraceContext();

























@@ -3017,7 +3017,7 @@ int GLTrace_glGetUniformLocation(GLuint program, const GLchar* name) {









    // call function







    // call function











    nsecs_t wallStartTime = systemTime(SYSTEM_TIME_MONOTONIC);







    nsecs_t wallStartTime = systemTime(SYSTEM_TIME_MONOTONIC);











    nsecs_t threadStartTime = systemTime(SYSTEM_TIME_THREAD);







    nsecs_t threadStartTime = systemTime(SYSTEM_TIME_THREAD);











    int retValue = glContext->hooks->gl.glGetUniformLocation(program, name);







    GLint retValue = glContext->hooks->gl.glGetUniformLocation(program, name);











    nsecs_t threadEndTime = systemTime(SYSTEM_TIME_THREAD);







    nsecs_t threadEndTime = systemTime(SYSTEM_TIME_THREAD);











    nsecs_t wallEndTime = systemTime(SYSTEM_TIME_MONOTONIC);







    nsecs_t wallEndTime = systemTime(SYSTEM_TIME_MONOTONIC);

















































opengl/libs/GLES_trace/src/gltrace_api.h



+2
−2




























Original line number
Original line
Diff line number
Diff line








@@ -78,7 +78,7 @@ void GLTrace_glGenTextures(GLsizei n, GLuint* textures);









void GLTrace_glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);







void GLTrace_glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);











void GLTrace_glGetActiveUniform(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);







void GLTrace_glGetActiveUniform(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);











void GLTrace_glGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);







void GLTrace_glGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);











int GLTrace_glGetAttribLocation(GLuint program, const GLchar* name);







GLint GLTrace_glGetAttribLocation(GLuint program, const GLchar* name);











void GLTrace_glGetBooleanv(GLenum pname, GLboolean* params);







void GLTrace_glGetBooleanv(GLenum pname, GLboolean* params);











void GLTrace_glGetBufferParameteriv(GLenum target, GLenum pname, GLint* params);







void GLTrace_glGetBufferParameteriv(GLenum target, GLenum pname, GLint* params);











GLenum GLTrace_glGetError(void);







GLenum GLTrace_glGetError(void);









@@ -97,7 +97,7 @@ void GLTrace_glGetTexParameterfv(GLenum target, GLenum pname, GLfloat* params);









void GLTrace_glGetTexParameteriv(GLenum target, GLenum pname, GLint* params);







void GLTrace_glGetTexParameteriv(GLenum target, GLenum pname, GLint* params);











void GLTrace_glGetUniformfv(GLuint program, GLint location, GLfloat* params);







void GLTrace_glGetUniformfv(GLuint program, GLint location, GLfloat* params);











void GLTrace_glGetUniformiv(GLuint program, GLint location, GLint* params);







void GLTrace_glGetUniformiv(GLuint program, GLint location, GLint* params);











int GLTrace_glGetUniformLocation(GLuint program, const GLchar* name);







GLint GLTrace_glGetUniformLocation(GLuint program, const GLchar* name);











void GLTrace_glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params);







void GLTrace_glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params);











void GLTrace_glGetVertexAttribiv(GLuint index, GLenum pname, GLint* params);







void GLTrace_glGetVertexAttribiv(GLuint index, GLenum pname, GLint* params);











void GLTrace_glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid** pointer);







void GLTrace_glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid** pointer);

































opengl/libs/GLES_trace/src/gltrace_fixup.cpp



+2
−2




























Original line number
Original line
Diff line number
Diff line








@@ -341,7 +341,7 @@ void fixup_glLinkProgram(GLMessage *glmsg) {









/** Given a glGetActive[Uniform|Attrib] call, obtain the location







/** Given a glGetActive[Uniform|Attrib] call, obtain the location











 *  of the variable of given name in the call.







 *  of the variable of given name in the call.











 */







 */











int getShaderVariableLocation(GLTraceContext *context, GLMessage *glmsg, GLchar *name) {







GLint getShaderVariableLocation(GLTraceContext *context, GLMessage *glmsg, GLchar *name) {











    GLMessage_Function func = glmsg->function();







    GLMessage_Function func = glmsg->function();











    if (func != GLMessage::glGetActiveAttrib && func != GLMessage::glGetActiveUniform) {







    if (func != GLMessage::glGetActiveAttrib && func != GLMessage::glGetActiveUniform) {











        return -1;







        return -1;










@@ -374,7 +374,7 @@ void fixup_glGetActiveAttribOrUniform(GLTraceContext *context, GLMessage *glmsg,









    // In order to make things simpler for the debugger, we also pass







    // In order to make things simpler for the debugger, we also pass











    // a hidden location argument that stores the actual location.







    // a hidden location argument that stores the actual location.











    // append the location value to the end of the argument list







    // append the location value to the end of the argument list











    int location = getShaderVariableLocation(context, glmsg, (GLchar*)pointersToFixup[3]);







    GLint location = getShaderVariableLocation(context, glmsg, (GLchar*)pointersToFixup[3]);











    GLMessage_DataType *arg_location = glmsg->add_args();







    GLMessage_DataType *arg_location = glmsg->add_args();











    arg_location->set_isarray(false);







    arg_location->set_isarray(false);











    arg_location->set_type(GLMessage::DataType::INT);







    arg_location->set_type(GLMessage::DataType::INT);