mesa: Implement the UBO-specific pnames of glGetActiveUniformsiv.
authorEric Anholt <eric@anholt.net>
Tue, 1 May 2012 21:15:14 +0000 (14:15 -0700)
committerEric Anholt <eric@anholt.net>
Fri, 20 Jul 2012 17:43:50 +0000 (10:43 -0700)
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
src/mesa/main/uniform_query.cpp

index b5499ea34457b924cf7cc13cfb1fa65066133208..816c2779cf355ec058178702f8a61e729905b5fe 100644 (file)
@@ -121,12 +121,23 @@ _mesa_GetActiveUniformsiv(GLuint program,
         break;
 
       case GL_UNIFORM_BLOCK_INDEX:
+        params[i] = uni->block_index;
+        break;
+
       case GL_UNIFORM_OFFSET:
+        params[i] = uni->offset;
+        break;
+
       case GL_UNIFORM_ARRAY_STRIDE:
+        params[i] = uni->array_stride;
+        break;
+
       case GL_UNIFORM_MATRIX_STRIDE:
+        params[i] = uni->matrix_stride;
+        break;
+
       case GL_UNIFORM_IS_ROW_MAJOR:
-        _mesa_problem(ctx, "FINISHME: glGetActiveUniformsiv(pname)");
-        params[i] = -1;
+        params[i] = uni->row_major;
         break;
 
       default: