summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/uniform_query.cpp15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index b5499ea3445..816c2779cf3 100644
--- a/src/mesa/main/uniform_query.cpp
+++ b/src/mesa/main/uniform_query.cpp
@@ -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: