summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2015-02-17 11:25:16 +1000
committerDave Airlie <airlied@redhat.com>2015-02-17 11:26:06 +1000
commitb53fbec01d8c76de0dff78c8fbceac08b2d02d3a (patch)
tree7d6c2d055eb896d78fb548739258e543a7d36467
parentfaaf13f6bf0ff826727af442beebc530ac1b74ac (diff)
downloadexternal_mesa3d-b53fbec01d8c76de0dff78c8fbceac08b2d02d3a.zip
external_mesa3d-b53fbec01d8c76de0dff78c8fbceac08b2d02d3a.tar.gz
external_mesa3d-b53fbec01d8c76de0dff78c8fbceac08b2d02d3a.tar.bz2
glsl/tests: add IMAGE type.
This fixes a warning when running make check. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Reviewed-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--src/glsl/tests/uniform_initializer_utils.cpp3
1 files changed, 3 insertions, 0 deletions
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: