Skip to content

Commit c5a4520

Browse files
lygstateMarge Bot
authored and
Marge Bot
committed
glsl: Fixes ident issue in glsl_parser.yy and update editorconfig for it
Signed-off-by: Yonggang Luo <[email protected]> Acked-by: Jesse Natalie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19875>
1 parent 9f5ace9 commit c5a4520

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ charset = utf-8
88
insert_final_newline = true
99
tab_width = 8
1010

11-
[*.{c,h,cpp,hpp,cc,hh,y}]
11+
[*.{c,h,cpp,hpp,cc,hh,y,yy}]
1212
indent_style = space
1313
indent_size = 3
1414
max_line_length = 78

src/compiler/glsl/glsl_parser.yy

+5-5
Original file line numberDiff line numberDiff line change
@@ -1438,10 +1438,10 @@ layout_qualifier_id:
14381438
"valid in fragment shaders");
14391439
}
14401440

1441-
if (state->INTEL_conservative_rasterization_enable) {
1442-
$$.flags.q.inner_coverage = 1;
1443-
} else {
1444-
_mesa_glsl_error(& @1, state,
1441+
if (state->INTEL_conservative_rasterization_enable) {
1442+
$$.flags.q.inner_coverage = 1;
1443+
} else {
1444+
_mesa_glsl_error(& @1, state,
14451445
"inner_coverage layout qualifier present, "
14461446
"but the INTEL_conservative_rasterization extension "
14471447
"is not enabled.");
@@ -1456,7 +1456,7 @@ layout_qualifier_id:
14561456
}
14571457

14581458
if (state->ARB_post_depth_coverage_enable ||
1459-
state->INTEL_conservative_rasterization_enable) {
1459+
state->INTEL_conservative_rasterization_enable) {
14601460
$$.flags.q.post_depth_coverage = 1;
14611461
} else {
14621462
_mesa_glsl_error(& @1, state,

0 commit comments

Comments
 (0)