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 <plamena.manolova@intel.com>
This commit is contained in:
Francisco Jerez 2018-02-12 15:24:39 -08:00
parent 6ebefb0fd5
commit 1bc01db95f
1 changed files with 7 additions and 2 deletions

View File

@ -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. */