From: Francisco Jerez Date: Mon, 12 Feb 2018 23:24:39 +0000 (-0800) Subject: glsl: Initialize ir_variable_data::fb_fetch_output earlier for GL(ES) 2. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1bc01db95fb5162f01a2c4a9b2473dd7a5eddcd8;p=mesa.git glsl: Initialize ir_variable_data::fb_fetch_output earlier for GL(ES) 2. At the same point where it is initialized on GL(ES) 3.0+ so we can implement some common layout qualifier handling in a future commit. Until now the fb_fetch_output flag would be inherited from the original implicit gl_LastFragData declaration at a later point in the AST to GLSL IR translation. Reviewed-by: Plamena Manolova --- diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index 41e74815f31..966450ca78b 100644 --- a/src/compiler/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp @@ -3994,8 +3994,13 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual, else if (qual->flags.q.shared_storage) var->data.mode = ir_var_shader_shared; - var->data.fb_fetch_output = state->stage == MESA_SHADER_FRAGMENT && - qual->flags.q.in && qual->flags.q.out; + if (!is_parameter && state->has_framebuffer_fetch() && + state->stage == MESA_SHADER_FRAGMENT) { + if (state->is_version(130, 300)) + var->data.fb_fetch_output = qual->flags.q.in && qual->flags.q.out; + else + var->data.fb_fetch_output = (strcmp(var->name, "gl_LastFragData") == 0); + } if (!is_parameter && is_varying_var(var, state->stage)) { /* User-defined ins/outs are not permitted in compute shaders. */