diff options
| author | Samuel Pitoiset <[email protected]> | 2017-05-01 22:24:52 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-05-06 16:40:19 +0200 |
| commit | 33931e4062b1f1a2373405033e7db5575c98eae8 (patch) | |
| tree | 3f7430dbe0c3d907c9867406ce5322b53c3ef0f7 /src/compiler | |
| parent | 1f40343e9a2a7113d2ee406ceda267975b8e7c5b (diff) | |
glsl: make count_attribute_slots() returns 1 for samplers/images
For packed varyings.
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Nicolai Hähnle <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/glsl_types.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp index 8fa626bba96..00a95d4a8ed 100644 --- a/src/compiler/glsl_types.cpp +++ b/src/compiler/glsl_types.cpp @@ -1963,6 +1963,8 @@ glsl_type::count_attribute_slots(bool is_vertex_input) const case GLSL_TYPE_INT: case GLSL_TYPE_FLOAT: case GLSL_TYPE_BOOL: + case GLSL_TYPE_SAMPLER: + case GLSL_TYPE_IMAGE: return this->matrix_columns; case GLSL_TYPE_DOUBLE: case GLSL_TYPE_UINT64: @@ -1985,8 +1987,6 @@ glsl_type::count_attribute_slots(bool is_vertex_input) const return this->length * this->fields.array->count_attribute_slots(is_vertex_input); case GLSL_TYPE_FUNCTION: - case GLSL_TYPE_SAMPLER: - case GLSL_TYPE_IMAGE: case GLSL_TYPE_ATOMIC_UINT: case GLSL_TYPE_VOID: case GLSL_TYPE_SUBROUTINE: |