Mesa (master): mesa: Implement the UBO-specific pnames of glGetActiveUniformsiv.

[Eric Anholt]

Module: Mesa
Branch: master
Commit: 548bce473367a53f45275356f8d5b9e7d98be5ce
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=548bce473367a53f45275356f8d5b9e7d98be5ce

Author: Eric Anholt <eric at anholt.net>
Date:   Tue May  1 14:15:14 2012 -0700

mesa: Implement the UBO-specific pnames of glGetActiveUniformsiv.

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/mesa/main/uniform_query.cpp |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index b5499ea..816c277 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: