webgl2_ubos test now covers ‘glGetUniformLocation for named uniform block’ bug

Author: Jura-Z

tests/webgl2_ubos.cpp

@@ -43,6 +43,7 @@ int main()
 
   const char *vertexShader =
     "#version 300 es\n"
+    "uniform mat4 a;\n"
     "uniform Block1a {\n"
     "  uniform mat4 var1;\n"
     "  uniform vec4 variable2;\n"
@@ -52,7 +53,7 @@ int main()
     "  uniform vec4 variable2;\n"
     "} block2dddd;\n"
     "void main() {\n"
-    "  gl_Position = block1bb.var1*block1bb.variable2 + block2dddd.var1*block2dddd.variable2;\n"
+    "  gl_Position = a * block1bb.var1*block1bb.variable2 + block2dddd.var1*block2dddd.variable2;\n"
     "}\n";
 
     const char *fragmentShader = 
@@ -112,6 +113,30 @@ int main()
   glGetProgramiv(program, GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH, &maxLength);
   printf("GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH: %d\n", maxLength);
   assert(maxLength == 12);
+  
+  GLint numActiveUniforms = -1;
+  glGetProgramiv(program, GL_ACTIVE_UNIFORMS, &numActiveUniforms);
+  printf("GL_ACTIVE_UNIFORMS: %d\n", numActiveUniforms);
+  assert(numActiveUniforms == 7);
+
+  for(int i = 0; i < numActiveUniforms; ++i)
+  {
+    char str[256] = {};
+    GLsizei length = -1;
+    GLint size = -1;
+    GLenum type = -1;
+    glGetActiveUniform(program, i, 255, &length, &size, &type, str);
+    
+    GLint loc = glGetUniformLocation(program, str);
+    
+    GLint indx = -1;
+    glGetActiveUniformsiv(program, 1, (GLuint*)&i, GL_UNIFORM_BLOCK_INDEX, &indx);
+
+    printf("Active uniform at index %d: %s\n", i, str);
+    printf("glGetUniformLocation = %d \t GL_UNIFORM_BLOCK_INDEX = %d \t size = %d \t type = %d\n", loc, indx, size, type);
+
+    assert((loc == -1) != (indx == -1)); // one of them must be true
+  }
 
   GLint numActiveUniformBlocks = -1;
   glGetProgramiv(program, GL_ACTIVE_UNIFORM_BLOCKS, &numActiveUniformBlocks);