OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: Omit redundant qualifier checks on redeclarations

Browse Source 
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Ian Romanick
2018-10-09 12:01:22 -07:00
parent 9b9f3218db
commit 61e003ce7e
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/compiler/glsl/ast_to_hir.cpp
View File

@@ -4284,8 +4284,7 @@ get_variable_being_redeclared(ir_variable **var_ptr, YYLTYPE loc,
} else if ((state->ARB_fragment_coord_conventions_enable || } else if ((state->ARB_fragment_coord_conventions_enable ||
state->is_version(150, 0)) state->is_version(150, 0))
&& strcmp(var->name, "gl_FragCoord") == 0 && strcmp(var->name, "gl_FragCoord") == 0
&& earlier->type == var->type && earlier->type == var->type) {
&& var->data.mode == ir_var_shader_in) {
/* Allow redeclaration of gl_FragCoord for ARB_fcc layout /* Allow redeclaration of gl_FragCoord for ARB_fcc layout
* qualifiers. * 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_BackSecondaryColor") == 0
|| strcmp(var->name, "gl_Color") == 0 || strcmp(var->name, "gl_Color") == 0
|| strcmp(var->name, "gl_SecondaryColor") == 0) || strcmp(var->name, "gl_SecondaryColor") == 0)
&& earlier->type == var->type && earlier->type == var->type) {
&& earlier->data.mode == var->data.mode) {
earlier->data.interpolation = var->data.interpolation; earlier->data.interpolation = var->data.interpolation;
/* Layout qualifiers for gl_FragDepth. */ /* 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->AMD_conservative_depth_enable ||
state->ARB_conservative_depth_enable) state->ARB_conservative_depth_enable)
&& strcmp(var->name, "gl_FragDepth") == 0 && strcmp(var->name, "gl_FragDepth") == 0
&& earlier->type == var->type && earlier->type == var->type) {
&& earlier->data.mode == var->data.mode) {
/** From the AMD_conservative_depth spec: /** From the AMD_conservative_depth spec:
* Within any shader, the first redeclarations of gl_FragDepth * Within any shader, the first redeclarations of gl_FragDepth