From bc5df3b321c5393b2f10115cfa5acc8f11bd7146 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Fri, 1 Jul 2016 19:10:36 -0400 Subject: [PATCH] Re-apply "glsl: don't try to lower non-gl builtins as if they were gl_FragData" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit If a shader has an output array, it will get treated as though it were gl_FragData and rewritten into gl_out_FragData instances. We only want this to happen on the actual gl_FragData and not everything else. This is a small part of the problem pointed out by the below bug. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96765 Signed-off-by: Ilia Mirkin Reviewed-by: Marek Olšák Reviewed-by: Kenneth Graunke --- src/compiler/glsl/opt_dead_builtin_varyings.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/compiler/glsl/opt_dead_builtin_varyings.cpp b/src/compiler/glsl/opt_dead_builtin_varyings.cpp index 33648d72cbf..900a09697bb 100644 --- a/src/compiler/glsl/opt_dead_builtin_varyings.cpp +++ b/src/compiler/glsl/opt_dead_builtin_varyings.cpp @@ -85,7 +85,8 @@ public: { ir_variable *var = ir->variable_referenced(); - if (!var || var->data.mode != this->mode || !var->type->is_array()) + if (!var || var->data.mode != this->mode || !var->type->is_array() || + !is_gl_identifier(var->name)) return visit_continue; /* Only match gl_FragData[], not gl_SecondaryFragDataEXT[] */ -- 2.30.2