From: Dave Airlie <airlied@redhat.com>
Date: Mon, 12 Oct 2015 03:23:29 +0000 (+1000)
Subject: glsl: count attributes for vertex inputs properly.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=97eee905471d7426d23c8a4c48b9810c586f9dff;p=mesa.git

glsl: count attributes for vertex inputs properly.

This function deals with vertex inputs and fragment
outputs, so we should count the attribute locations
correctly for the vertex inputs.

Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index ff22b3df713..c7e69765335 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -2466,7 +2466,7 @@ assign_attribute_or_color_locations(gl_shader_program *prog,
          return false;
       }
 
-      const unsigned slots = var->type->count_attribute_slots(false);
+      const unsigned slots = var->type->count_attribute_slots(target_index == MESA_SHADER_VERTEX ? true : false);
 
       /* If the variable is not a built-in and has a location statically
        * assigned in the shader (presumably via a layout qualifier), make sure