Mesa (master): glsl/tests: add IMAGE type.

[Dave Airlie]

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

Author: Ilia Mirkin <imir...@alum.mit.edu>
Date:   Tue Feb 17 11:25:16 2015 +1000

glsl/tests: add IMAGE type.

This fixes a warning when running make check.

Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu>
Reviewed-by: Dave Airlie <airl...@redhat.com>
Signed-off-by: Dave Airlie <airl...@redhat.com>

---

 src/glsl/tests/uniform_initializer_utils.cpp |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/glsl/tests/uniform_initializer_utils.cpp 
b/src/glsl/tests/uniform_initializer_utils.cpp
index 6f47acd..31dc9b7 100644
--- a/src/glsl/tests/uniform_initializer_utils.cpp
+++ b/src/glsl/tests/uniform_initializer_utils.cpp
@@ -84,6 +84,7 @@ generate_data_element(void *mem_ctx, const glsl_type *type,
       case GLSL_TYPE_UINT:
       case GLSL_TYPE_INT:
       case GLSL_TYPE_SAMPLER:
+      case GLSL_TYPE_IMAGE:
         data.i[i] = values[idx];
         break;
       case GLSL_TYPE_FLOAT:
@@ -112,6 +113,7 @@ generate_data_element(void *mem_ctx, const glsl_type *type,
       case GLSL_TYPE_UINT:
       case GLSL_TYPE_INT:
       case GLSL_TYPE_SAMPLER:
+      case GLSL_TYPE_IMAGE:
         ASSERT_EQ(data.i[i], val->value.i[i]);
         break;
       case GLSL_TYPE_FLOAT:
@@ -212,6 +214,7 @@ verify_data(gl_constant_value *storage, unsigned 
storage_array_size,
         case GLSL_TYPE_UINT:
         case GLSL_TYPE_INT:
         case GLSL_TYPE_SAMPLER:
+        case GLSL_TYPE_IMAGE:
            EXPECT_EQ(val->value.i[i], storage[i].i);
            break;
         case GLSL_TYPE_FLOAT:

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit