mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-26 19:54:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

glsl: Fixes ident issue in glsl_parser.yy and update editorconfig for it

Browse Source 
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19875>
This commit is contained in:
Yonggang Luo 2022-11-23 00:34:35 +08:00 committed by Marge Bot
parent 9f5ace9857
commit c5a4520b3c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.editorconfig
View File

@ -8,7 +8,7 @@ charset = utf-8
insert_final_newline = true insert_final_newline = true
tab_width = 8 tab_width = 8
[*.{c,h,cpp,hpp,cc,hh,y}] [*.{c,h,cpp,hpp,cc,hh,y,yy}]
indent_style = space indent_style = space
indent_size = 3 indent_size = 3
max_line_length = 78 max_line_length = 78

10
src/compiler/glsl/glsl_parser.yy
View File

@ -1438,10 +1438,10 @@ layout_qualifier_id:
"valid in fragment shaders"); "valid in fragment shaders");
} }
if (state->INTEL_conservative_rasterization_enable) { if (state->INTEL_conservative_rasterization_enable) {
$$.flags.q.inner_coverage = 1; $$.flags.q.inner_coverage = 1;
} else { } else {
_mesa_glsl_error(& @1, state, _mesa_glsl_error(& @1, state,
"inner_coverage layout qualifier present, " "inner_coverage layout qualifier present, "
"but the INTEL_conservative_rasterization extension " "but the INTEL_conservative_rasterization extension "
"is not enabled."); "is not enabled.");
@ -1456,7 +1456,7 @@ layout_qualifier_id:
} }
if (state->ARB_post_depth_coverage_enable || if (state->ARB_post_depth_coverage_enable ||
state->INTEL_conservative_rasterization_enable) { state->INTEL_conservative_rasterization_enable) {
$$.flags.q.post_depth_coverage = 1; $$.flags.q.post_depth_coverage = 1;
} else { } else {
_mesa_glsl_error(& @1, state, _mesa_glsl_error(& @1, state,