From: Eric Anholt <eric@anholt.net>
Date: Tue, 1 May 2012 21:15:14 +0000 (-0700)
Subject: mesa: Implement the UBO-specific pnames of glGetActiveUniformsiv.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=548bce473367a53f45275356f8d5b9e7d98be5ce;p=mesa.git

mesa: Implement the UBO-specific pnames of glGetActiveUniformsiv.

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

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: