From c5a4520b3ce5c00e13fa663e1639ff9ca65e5ee3 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Wed, 23 Nov 2022 00:34:35 +0800 Subject: [PATCH] glsl: Fixes ident issue in glsl_parser.yy and update editorconfig for it Signed-off-by: Yonggang Luo Acked-by: Jesse Natalie Part-of: --- .editorconfig | 2 +- src/compiler/glsl/glsl_parser.yy | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.editorconfig b/.editorconfig index 6f7d47e90b3..3c6b234f182 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,7 +8,7 @@ charset = utf-8 insert_final_newline = true tab_width = 8 -[*.{c,h,cpp,hpp,cc,hh,y}] +[*.{c,h,cpp,hpp,cc,hh,y,yy}] indent_style = space indent_size = 3 max_line_length = 78 diff --git a/src/compiler/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy index f887cdb247b..428ff53cd31 100644 --- a/src/compiler/glsl/glsl_parser.yy +++ b/src/compiler/glsl/glsl_parser.yy @@ -1438,10 +1438,10 @@ layout_qualifier_id: "valid in fragment shaders"); } - if (state->INTEL_conservative_rasterization_enable) { - $$.flags.q.inner_coverage = 1; - } else { - _mesa_glsl_error(& @1, state, + if (state->INTEL_conservative_rasterization_enable) { + $$.flags.q.inner_coverage = 1; + } else { + _mesa_glsl_error(& @1, state, "inner_coverage layout qualifier present, " "but the INTEL_conservative_rasterization extension " "is not enabled."); @@ -1456,7 +1456,7 @@ layout_qualifier_id: } if (state->ARB_post_depth_coverage_enable || - state->INTEL_conservative_rasterization_enable) { + state->INTEL_conservative_rasterization_enable) { $$.flags.q.post_depth_coverage = 1; } else { _mesa_glsl_error(& @1, state,