Mesa (master): mesa: Implement image uniform queries.

[Francisco Jerez]

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

Author: Francisco Jerez <currojerez at riseup.net>
Date:   Tue Jan 20 17:50:15 2015 +0200

mesa: Implement image uniform queries.

Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/mesa/main/uniform_query.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index 3e857ed..728bd1b 100644
--- a/src/mesa/main/uniform_query.cpp
+++ b/src/mesa/main/uniform_query.cpp
@@ -347,7 +347,8 @@ _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location,
 	      &&
 	      (uni->type->base_type == GLSL_TYPE_INT
 	       || uni->type->base_type == GLSL_TYPE_UINT
-	       || uni->type->base_type == GLSL_TYPE_SAMPLER))) {
+               || uni->type->base_type == GLSL_TYPE_SAMPLER
+               || uni->type->base_type == GLSL_TYPE_IMAGE))) {
 	 memcpy(paramsOut, src, bytes);
       } else {
 	 union gl_constant_value *const dst =
@@ -366,6 +367,7 @@ _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location,
 		  break;
 	       case GLSL_TYPE_INT:
 	       case GLSL_TYPE_SAMPLER:
+               case GLSL_TYPE_IMAGE:
 		  dst[i].f = (float) src[i].i;
 		  break;
 	       case GLSL_TYPE_BOOL: