From: Marek Olšák Date: Mon, 8 Aug 2016 20:05:29 +0000 (+0200) Subject: Revert "glsl: don't try to lower non-gl builtins as if they were gl_FragData" X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1ebf3c4b6741a3a3a9d46048abe3996cb9a86334;p=mesa.git Revert "glsl: don't try to lower non-gl builtins as if they were gl_FragData" This reverts commit a37e46323c7e18bec4160f2f66847c10b7041dc1. It broke the game Overlord such that it hung a GCN GNU. While I don't know how the hang happened because of its randomness and gfx corruption precedes it, many of the shaders contain this: out vec4 FragData[gl_MaxDrawBuffers]; --- diff --git a/src/compiler/glsl/opt_dead_builtin_varyings.cpp b/src/compiler/glsl/opt_dead_builtin_varyings.cpp index 900a09697bb..33648d72cbf 100644 --- a/src/compiler/glsl/opt_dead_builtin_varyings.cpp +++ b/src/compiler/glsl/opt_dead_builtin_varyings.cpp @@ -85,8 +85,7 @@ public: { ir_variable *var = ir->variable_referenced(); - if (!var || var->data.mode != this->mode || !var->type->is_array() || - !is_gl_identifier(var->name)) + if (!var || var->data.mode != this->mode || !var->type->is_array()) return visit_continue; /* Only match gl_FragData[], not gl_SecondaryFragDataEXT[] */