Module: Mesa Branch: master Commit: 61e003ce7ec40a1a41802f8fea97c7c33b46a8ba URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=61e003ce7ec40a1a41802f8fea97c7c33b46a8ba
Author: Ian Romanick <[email protected]> Date: Tue Oct 9 12:01:22 2018 -0700 glsl: Omit redundant qualifier checks on redeclarations Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Timothy Arceri <[email protected]> --- src/compiler/glsl/ast_to_hir.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index 8a41db66b9..f1fdd0c4a5 100644 --- a/src/compiler/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp @@ -4284,8 +4284,7 @@ get_variable_being_redeclared(ir_variable **var_ptr, YYLTYPE loc, } else if ((state->ARB_fragment_coord_conventions_enable || state->is_version(150, 0)) && strcmp(var->name, "gl_FragCoord") == 0 - && earlier->type == var->type - && var->data.mode == ir_var_shader_in) { + && earlier->type == var->type) { /* Allow redeclaration of gl_FragCoord for ARB_fcc layout * qualifiers. */ @@ -4309,8 +4308,7 @@ get_variable_being_redeclared(ir_variable **var_ptr, YYLTYPE loc, || strcmp(var->name, "gl_BackSecondaryColor") == 0 || strcmp(var->name, "gl_Color") == 0 || strcmp(var->name, "gl_SecondaryColor") == 0) - && earlier->type == var->type - && earlier->data.mode == var->data.mode) { + && earlier->type == var->type) { earlier->data.interpolation = var->data.interpolation; /* Layout qualifiers for gl_FragDepth. */ @@ -4318,8 +4316,7 @@ get_variable_being_redeclared(ir_variable **var_ptr, YYLTYPE loc, state->AMD_conservative_depth_enable || state->ARB_conservative_depth_enable) && strcmp(var->name, "gl_FragDepth") == 0 - && earlier->type == var->type - && earlier->data.mode == var->data.mode) { + && earlier->type == var->type) { /** From the AMD_conservative_depth spec: * Within any shader, the first redeclarations of gl_FragDepth _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
