diff options
| author | Ilia Mirkin <[email protected]> | 2016-07-01 19:10:36 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2016-08-10 15:43:36 +0200 |
| commit | bc5df3b321c5393b2f10115cfa5acc8f11bd7146 (patch) | |
| tree | 7897ae52ba1bfbedc3af2acc9ea487a0c4da1c85 | |
| parent | 9c63fd90561c32bccd905d8e0abf4864941f359a (diff) | |
Re-apply "glsl: don't try to lower non-gl builtins as if they were gl_FragData"
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 <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/compiler/glsl/opt_dead_builtin_varyings.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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[] */ |