From: Ian Romanick <ian.d.roman...@intel.com>
This has the same value has gl_program_parameter::DataType field.
Signed-off-by: Ian Romanick <ian.d.roman...@intel.com>
---
src/mesa/main/uniform_query.cpp | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index 3164d72..ba7d759 100644
--- a/src/mesa/main/uniform_query.cpp
+++ b/src/mesa/main/uniform_query.cpp
@@ -54,12 +54,14 @@ _mesa_GetActiveUniformARB(GLhandleARB program, GLuint index,
if (!param)
return;
+ const struct gl_uniform *const uni = &shProg->Uniforms->Uniforms[index];
+
if (nameOut) {
_mesa_copy_string(nameOut, maxLength, length, param->Name);
}
if (size) {
- GLint typeSize = _mesa_sizeof_glsl_type(param->DataType);
+ GLint typeSize = _mesa_sizeof_glsl_type(uni->Type->gl_type);
if ((GLint) param->Size > typeSize) {
/* This is an array.
* Array elements are placed on vector[4] boundaries so they're
@@ -73,6 +75,6 @@ _mesa_GetActiveUniformARB(GLhandleARB program, GLuint index,
}
if (type) {
- *type = param->DataType;
+ *type = uni->Type->gl_type;
}
}
--
1.7.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
