diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2013-10-20 12:35:47 -0700 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2013-10-29 12:40:55 -0700 |
| commit | 26db3b933f7fbc81d6c2bead2a8b0479a3691424 (patch) | |
| tree | 217193e3025d3946565e809793508ad797497279 /src/glsl/tests | |
| parent | 0bed1ab73bc8a673b4d7d590d9d39b76fd8bf797 (diff) | |
| download | external_mesa3d-26db3b933f7fbc81d6c2bead2a8b0479a3691424.zip external_mesa3d-26db3b933f7fbc81d6c2bead2a8b0479a3691424.tar.gz external_mesa3d-26db3b933f7fbc81d6c2bead2a8b0479a3691424.tar.bz2 | |
glsl: Add new atomic_uint built-in GLSL type.
v2: Fix GLSL version in which the type became available. Add
contains_atomic() convenience method. Split off atomic counter
comparison error checking to a separate patch that will handle all
opaque types. Include new ir_variable fields for atomic types.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/glsl/tests')
| -rw-r--r-- | src/glsl/tests/uniform_initializer_utils.cpp | 3 |
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 a04f5dd..5e86c24 100644 --- a/src/glsl/tests/uniform_initializer_utils.cpp +++ b/src/glsl/tests/uniform_initializer_utils.cpp @@ -92,6 +92,7 @@ generate_data_element(void *mem_ctx, const glsl_type *type, case GLSL_TYPE_BOOL: data.b[i] = bool(values[idx]); break; + case GLSL_TYPE_ATOMIC_UINT: case GLSL_TYPE_STRUCT: case GLSL_TYPE_ARRAY: case GLSL_TYPE_VOID: @@ -119,6 +120,7 @@ generate_data_element(void *mem_ctx, const glsl_type *type, case GLSL_TYPE_BOOL: ASSERT_EQ(data.b[i], val->value.b[i]); break; + case GLSL_TYPE_ATOMIC_UINT: case GLSL_TYPE_STRUCT: case GLSL_TYPE_ARRAY: case GLSL_TYPE_VOID: @@ -217,6 +219,7 @@ verify_data(gl_constant_value *storage, unsigned storage_array_size, case GLSL_TYPE_BOOL: EXPECT_EQ(int(val->value.b[i]), storage[i].i); break; + case GLSL_TYPE_ATOMIC_UINT: case GLSL_TYPE_STRUCT: case GLSL_TYPE_ARRAY: case GLSL_TYPE_VOID: |