diff --git a/src/main/cpp/gl/gl_native.c b/src/main/cpp/gl/gl_native.c index 6adc481..072bca2 100644 --- a/src/main/cpp/gl/gl_native.c +++ b/src/main/cpp/gl/gl_native.c @@ -914,8 +914,8 @@ NATIVE_FUNCTION_HEAD(void,glDisableVertexAttribArray,GLuint index); NATIVE_FUNCT NATIVE_FUNCTION_HEAD(void,glEnableVertexAttribArray,GLuint index); NATIVE_FUNCTION_END_NO_RETURN(void,glEnableVertexAttribArray,index) NATIVE_FUNCTION_HEAD(void,glGetActiveAttrib,GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLint* size, GLenum* type, GLchar* name); NATIVE_FUNCTION_END_NO_RETURN(void,glGetActiveAttrib,program,index,bufSize,length,size,type,name) NATIVE_FUNCTION_HEAD(void,glGetActiveUniform,GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLint* size, GLenum* type, GLchar* name); NATIVE_FUNCTION_END_NO_RETURN(void,glGetActiveUniform,program,index,bufSize,length,size,type,name) -NATIVE_FUNCTION_HEAD(GLint,glGetAttribLocation,GLuint program, const GLchar* name); NATIVE_FUNCTION_END_NO_RETURN(GLint,glGetAttribLocation,program,name) -NATIVE_FUNCTION_HEAD(GLint,glGetUniformLocation,GLuint program, const GLchar* name); NATIVE_FUNCTION_END_NO_RETURN(GLint,glGetUniformLocation,program,name) +NATIVE_FUNCTION_HEAD(GLint,glGetAttribLocation,GLuint program, const GLchar* name); NATIVE_FUNCTION_END(GLint,glGetAttribLocation,program,name) +NATIVE_FUNCTION_HEAD(GLint,glGetUniformLocation,GLuint program, const GLchar* name); NATIVE_FUNCTION_END(GLint,glGetUniformLocation,program,name) NATIVE_FUNCTION_HEAD(void,glGetUniformfv,GLuint program, GLint location, GLfloat* params); NATIVE_FUNCTION_END_NO_RETURN(void,glGetUniformfv,program,location,params) NATIVE_FUNCTION_HEAD(void,glGetUniformiv,GLuint program, GLint location, GLint* params); NATIVE_FUNCTION_END_NO_RETURN(void,glGetUniformiv,program,location,params) NATIVE_FUNCTION_HEAD(void,glGetVertexAttribdv,GLuint index, GLenum pname, GLdouble* params); NATIVE_FUNCTION_END_NO_RETURN(void,glGetVertexAttribdv,index,pname,params) @@ -926,14 +926,14 @@ NATIVE_FUNCTION_HEAD(void,glUniform1f,GLint location, GLfloat v0); NATIVE_FUNCTI NATIVE_FUNCTION_HEAD(void,glUniform2f,GLint location, GLfloat v0, GLfloat v1); NATIVE_FUNCTION_END_NO_RETURN(void,glUniform2f,location,v0,v1) NATIVE_FUNCTION_HEAD(void,glUniform3f,GLint location, GLfloat v0, GLfloat v1, GLfloat v2); NATIVE_FUNCTION_END_NO_RETURN(void,glUniform3f,location,v0,v1,v2) NATIVE_FUNCTION_HEAD(void,glUniform4f,GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); NATIVE_FUNCTION_END_NO_RETURN(void,glUniform4f,location,v0,v1,v2,v3) -NATIVE_FUNCTION_HEAD(void,glUniform1i,GLint location, GLint v0); NATIVE_FUNCTION_END_NO_RETURN(void,glUniform1i,location,v0) +//NATIVE_FUNCTION_HEAD(void,glUniform1i,GLint location, GLint v0); NATIVE_FUNCTION_END_NO_RETURN(void,glUniform1i,location,v0) NATIVE_FUNCTION_HEAD(void,glUniform2i,GLint location, GLint v0, GLint v1); NATIVE_FUNCTION_END_NO_RETURN(void,glUniform2i,location,v0,v1) NATIVE_FUNCTION_HEAD(void,glUniform3i,GLint location, GLint v0, GLint v1, GLint v2); NATIVE_FUNCTION_END_NO_RETURN(void,glUniform3i,location,v0,v1,v2) NATIVE_FUNCTION_HEAD(void,glUniform4i,GLint location, GLint v0, GLint v1, GLint v2, GLint v3); NATIVE_FUNCTION_END_NO_RETURN(void,glUniform4i,location,v0,v1,v2,v3) NATIVE_FUNCTION_HEAD(void,glUniform1fv,GLint location, GLsizei count, const GLfloat* value); NATIVE_FUNCTION_END_NO_RETURN(void,glUniform1fv,location,count,value) NATIVE_FUNCTION_HEAD(void,glUniform2fv,GLint location, GLsizei count, const GLfloat* value); NATIVE_FUNCTION_END_NO_RETURN(void,glUniform2fv,location,count,value) NATIVE_FUNCTION_HEAD(void,glUniform3fv,GLint location, GLsizei count, const GLfloat* value); NATIVE_FUNCTION_END_NO_RETURN(void,glUniform3fv,location,count,value) -NATIVE_FUNCTION_HEAD(void,glUniform4fv,GLint location, GLsizei count, const GLfloat* value); NATIVE_FUNCTION_END_NO_RETURN(void,glUniform4fv,location,count,value) +//NATIVE_FUNCTION_HEAD(void,glUniform4fv,GLint location, GLsizei count, const GLfloat* value); NATIVE_FUNCTION_END_NO_RETURN(void,glUniform4fv,location,count,value) NATIVE_FUNCTION_HEAD(void,glUniform1iv,GLint location, GLsizei count, const GLint* value); NATIVE_FUNCTION_END_NO_RETURN(void,glUniform1iv,location,count,value) NATIVE_FUNCTION_HEAD(void,glUniform2iv,GLint location, GLsizei count, const GLint* value); NATIVE_FUNCTION_END_NO_RETURN(void,glUniform2iv,location,count,value) NATIVE_FUNCTION_HEAD(void,glUniform3iv,GLint location, GLsizei count, const GLint* value); NATIVE_FUNCTION_END_NO_RETURN(void,glUniform3iv,location,count,value)