TheCloud/MobileGlues
1
0
Fork 0
mirror of https://github.com/MobileGL-Dev/MobileGlues.git synced 2025-09-24 03:31:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-es' of github.com:Swung0x48/MobileGlues into dev-es

Browse Source 
# Conflicts:
#	src/main/cpp/gl/gl_native.c
This commit is contained in:
BZLZHH 2025-01-29 00:54:15 +08:00
commit 867307921f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/cpp/gl/gl.c
View File

@ -16,15 +16,20 @@ GLAPI GLAPIENTRY GLenum glGetError() {
return gles_glGetError();
}
static char renderer_str[512];
GLAPI GLAPIENTRY const GLubyte * glGetString( GLenum name ) {
LOG();
LOAD_GLES(glGetString, const GLubyte *, GLenum);
switch (name) {
case GL_VENDOR:
return (const GLubyte *)"Swung0x48, BZLZHH";
case GL_RENDERER:
return (const GLubyte *)"2.1 MobileGlues";
case GL_VERSION:
return (const GLubyte *)"2.1.0";
case GL_VERSION: {
GLubyte *orig_str = gles_glGetString(GL_RENDERER);
snprintf(renderer_str, 512 - 1, "2.1.0 %s", orig_str);
return (const GLubyte *) renderer_str;
}
}
return (const GLubyte *)"NotSupported_GLenum";
}

3
src/main/cpp/gl/gl_native.c
View File

@ -914,7 +914,7 @@ 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,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)
@ -927,7 +927,6 @@ NATIVE_FUNCTION_HEAD(void,glUniform2f,GLint location, GLfloat v0, GLfloat v1); N
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,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)