From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Mon, 1 May 2017 20:24:52 +0000 (+0200)
Subject: glsl: make count_attribute_slots() returns 1 for samplers/images
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=33931e4062b1f1a2373405033e7db5575c98eae8;p=mesa.git

glsl: make count_attribute_slots() returns 1 for samplers/images

For packed varyings.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
---

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: