wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Merge the "discard_statement" rule into "jump_statement".

Browse Source
This commit is contained in:
Zebediah Figura 2023-05-02 16:23:35 -05:00 committed by Alexandre Julliard
parent 588784e4dc
commit 7d521db3db
Notes: Alexandre Julliard 2023-06-28 23:03:54 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/230
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/vkd3d-shader/hlsl.y
View File

@ -4431,7 +4431,6 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type
%type <list> conditional_expr %type <list> conditional_expr
%type <list> declaration %type <list> declaration
%type <list> declaration_statement %type <list> declaration_statement
%type <list> discard_statement
%type <list> equality_expr %type <list> equality_expr
%type <list> expr %type <list> expr
%type <list> expr_optional %type <list> expr_optional
@ -5741,7 +5740,6 @@ statement:
declaration_statement declaration_statement
| expr_statement | expr_statement
| compound_statement | compound_statement
| discard_statement
| jump_statement | jump_statement
| selection_statement | selection_statement
| loop_statement | loop_statement
@ -5760,9 +5758,7 @@ jump_statement:
if (!add_return(ctx, $$, NULL, &@1)) if (!add_return(ctx, $$, NULL, &@1))
YYABORT; YYABORT;
} }
| KW_DISCARD ';'
discard_statement:
KW_DISCARD ';'
{ {
struct hlsl_ir_node *discard, *c; struct hlsl_ir_node *discard, *c;