From 33931e4062b1f1a2373405033e7db5575c98eae8 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 1 May 2017 22:24:52 +0200 Subject: [PATCH] glsl: make count_attribute_slots() returns 1 for samplers/images MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit For packed varyings. Signed-off-by: Samuel Pitoiset Reviewed-by: Nicolai Hähnle Reviewed-by: Timothy Arceri --- src/compiler/glsl_types.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp index 8fa626b..00a95d4 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: -- 2.7.4