From 4bf986274728dbad7428094ee8e2da17d19edfba Mon Sep 17 00:00:00 2001 From: Rhys Kidd Date: Sat, 11 Feb 2017 17:31:09 -0500 Subject: glsl/tests: Add UINT64 and INT64 types MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit glsl/tests/uniform_initializer_utils.cpp:83:14: warning: enumeration value ‘GLSL_TYPE_UINT64’ not handled in switch [-Wswitch] switch (type->base_type) { ^ glsl/tests/uniform_initializer_utils.cpp:83:14: warning: enumeration value ‘GLSL_TYPE_INT64’ not handled in switch [-Wswitch] Fixes: 8ce53d4a2f3 ("glsl: Add basic ARB_gpu_shader_int64 types") Signed-off-by: Rhys Kidd Reviewed-by: Emil Velikov Reviewed-by: Elie Tournier --- src/compiler/glsl/tests/uniform_initializer_utils.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src/compiler/glsl') diff --git a/src/compiler/glsl/tests/uniform_initializer_utils.cpp b/src/compiler/glsl/tests/uniform_initializer_utils.cpp index ec64be18cb3..2a1a16839b8 100644 --- a/src/compiler/glsl/tests/uniform_initializer_utils.cpp +++ b/src/compiler/glsl/tests/uniform_initializer_utils.cpp @@ -96,6 +96,12 @@ generate_data_element(void *mem_ctx, const glsl_type *type, case GLSL_TYPE_DOUBLE: data.d[i] = double(values[idx]); break; + case GLSL_TYPE_UINT64: + data.u64[i] = (uint64_t) values[idx]; + break; + case GLSL_TYPE_INT64: + data.i64[i] = (int64_t) values[idx]; + break; case GLSL_TYPE_ATOMIC_UINT: case GLSL_TYPE_STRUCT: case GLSL_TYPE_ARRAY: @@ -130,6 +136,12 @@ generate_data_element(void *mem_ctx, const glsl_type *type, case GLSL_TYPE_DOUBLE: ASSERT_EQ(data.d[i], val->value.d[i]); break; + case GLSL_TYPE_UINT64: + ASSERT_EQ(data.u64[i], val->value.u64[i]); + break; + case GLSL_TYPE_INT64: + ASSERT_EQ(data.i64[i], val->value.i64[i]); + break; case GLSL_TYPE_ATOMIC_UINT: case GLSL_TYPE_STRUCT: case GLSL_TYPE_ARRAY: @@ -236,6 +248,12 @@ verify_data(gl_constant_value *storage, unsigned storage_array_size, case GLSL_TYPE_DOUBLE: EXPECT_EQ(val->value.d[i], *(double *)&storage[i*2].i); break; + case GLSL_TYPE_UINT64: + EXPECT_EQ(val->value.u64[i], *(uint64_t *)&storage[i*2].i); + break; + case GLSL_TYPE_INT64: + EXPECT_EQ(val->value.i64[i], *(int64_t *)&storage[i*2].i); + break; case GLSL_TYPE_ATOMIC_UINT: case GLSL_TYPE_STRUCT: case GLSL_TYPE_ARRAY: -- cgit v1.2.3