diff options
| author | Samuel Pitoiset <[email protected]> | 2017-04-26 13:49:13 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-05-02 22:40:45 +0200 |
| commit | e0e01895b054847e41b98cbf3939520747a0f32d (patch) | |
| tree | ef7e9aa02a6515ba31b57e164ce5a3f48b8479ad /src/compiler | |
| parent | ece06defe77a77d2db40abeddee5a2e0e45654ce (diff) | |
glsl: set vector_elements to 1 for samplers
I don't see any reasons why vector_elements is 1 for images and
0 for samplers. This increases consistency and allows to clean
up some code a bit.
This will also help for ARB_bindless_texture.
No piglit regressions with RadeonSI.
This time the Intel CI system doesn't report any failures.
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/glsl_types.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp index 0480bef80ec..bf078ad6141 100644 --- a/src/compiler/glsl_types.cpp +++ b/src/compiler/glsl_types.cpp @@ -95,12 +95,7 @@ glsl_type::glsl_type(GLenum gl_type, glsl_base_type base_type, memset(& fields, 0, sizeof(fields)); - if (is_sampler()) { - /* Samplers take no storage whatsoever. */ - matrix_columns = vector_elements = 0; - } else { - matrix_columns = vector_elements = 1; - } + matrix_columns = vector_elements = 1; } glsl_type::glsl_type(const glsl_struct_field *fields, unsigned num_fields, |