Browse Source

glgsg: No need to fetch glGetUniformuiv by function ptr in GLES

rdb 1 year ago
parent
commit
bdfb2c9dcc

+ 0 - 3
panda/src/glstuff/glGraphicsStateGuardian_src.cxx

@@ -2155,8 +2155,6 @@ reset() {
        get_extension_func("glGetShaderInfoLog");
     _glGetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC)
        get_extension_func("glGetUniformLocation");
-    _glGetUniformiv = (PFNGLGETUNIFORMIVPROC)
-       get_extension_func("glGetUniformiv");
     _glLinkProgram = (PFNGLLINKPROGRAMPROC)
        get_extension_func("glLinkProgram");
     _glShaderSource = (PFNGLSHADERSOURCEPROC_P)
@@ -2313,7 +2311,6 @@ reset() {
   _glGetShaderiv = glGetShaderiv;
   _glGetShaderInfoLog = glGetShaderInfoLog;
   _glGetUniformLocation = glGetUniformLocation;
-  _glGetUniformiv = glGetUniformiv;
   _glLinkProgram = glLinkProgram;
   _glShaderSource = (PFNGLSHADERSOURCEPROC_P) glShaderSource;
   _glUseProgram = glUseProgram;

+ 0 - 2
panda/src/glstuff/glGraphicsStateGuardian_src.h

@@ -166,7 +166,6 @@ typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei buf
 typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
 typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
 typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
 typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
 typedef void (APIENTRYP PFNGLSHADERSOURCEPROC_P) (GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length);
 typedef void (APIENTRYP PFNGLSPECIALIZESHADERARBPROC) (GLuint shader, const GLchar *, GLuint, const GLuint *, const GLuint *);
@@ -1052,7 +1051,6 @@ public:
   PFNGLGETSHADERIVPROC _glGetShaderiv;
   PFNGLGETSHADERINFOLOGPROC _glGetShaderInfoLog;
   PFNGLGETUNIFORMLOCATIONPROC _glGetUniformLocation;
-  PFNGLGETUNIFORMIVPROC _glGetUniformiv;
   PFNGLLINKPROGRAMPROC _glLinkProgram;
   PFNGLSPECIALIZESHADERARBPROC _glSpecializeShader;
   PFNGLSHADERBINARYPROC _glShaderBinary;

+ 1 - 1
panda/src/glstuff/glShaderContext_src.cxx

@@ -504,7 +504,7 @@ r_collect_uniforms(const Shader::Parameter &param, UniformBlock &block,
 
     // In OpenGL ES, we can't specify a binding index after the fact.
 #ifdef OPENGLES
-    _glgsg->_glGetUniformiv(_glsl_program, location, &unit._binding_index);
+    glGetUniformiv(_glsl_program, location, &unit._binding_index);
 #else
     _glgsg->_glUniform1i(location, (GLint)_image_units.size());
 #endif