From: Iago Toral Quiroga <itoral@igalia.com>
Date: Fri, 27 Nov 2015 11:46:20 +0000 (+0100)
Subject: glsl/dead_builin_varyings: Fix gl_FragData array lowering
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=750393ff7d6162372f368f5ed726b23f4cae49a0;p=mesa.git

glsl/dead_builin_varyings: Fix gl_FragData array lowering

The current implementation looks for array dereferences on gl_FragData and
immediately proceeds to lower them, however this is not enough because we
can have array access on vector variables too, like in this code:

out vec4 color;
void main()
{
   int i;
   for (i = 0; i < 4; i++)
      color[i] = 1.0;
}

Fix it by making sure that the actual variable being dereferenced is an array.

Fixes a crash in:
spec/arb_gpu_shader_fp64/execution/built-in-functions/fs-ldexp-dvec4.shader_test

Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
---

diff --git a/src/glsl/opt_dead_builtin_varyings.cpp b/src/glsl/opt_dead_builtin_varyings.cpp
index 68b70eedf92..53871130e12 100644
--- a/src/glsl/opt_dead_builtin_varyings.cpp
+++ b/src/glsl/opt_dead_builtin_varyings.cpp
@@ -85,7 +85,7 @@ public:
    {
       ir_variable *var = ir->variable_referenced();
 
-      if (!var || var->data.mode != this->mode)
+      if (!var || var->data.mode != this->mode || !var->type->is_array())
          return visit_continue;
 
       if (this->find_frag_outputs && var->data.location == FRAG_RESULT_DATA0) {