wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Rename the rule for an optional name.

Browse Source 
Names are optional for both techniques and passes.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2023-11-11 00:32:40 +01:00 committed by Alexandre Julliard
parent 43ff28b00b
commit 0a6d842ed1
Notes: Alexandre Julliard 2024-01-15 23:02:43 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/560
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5102,7 +5102,7 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls
%type <name> any_identifier %type <name> any_identifier
%type <name> var_identifier %type <name> var_identifier
%type <name> technique_name %type <name> name_opt
%type <parameter> parameter %type <parameter> parameter
@ -5148,7 +5148,7 @@ hlsl_prog:
| hlsl_prog effect_group | hlsl_prog effect_group
| hlsl_prog ';' | hlsl_prog ';'
technique_name: name_opt:
%empty %empty
{ {
$$ = NULL; $$ = NULL;
@ -5159,14 +5159,14 @@ pass_list:
%empty %empty
technique9: technique9:
KW_TECHNIQUE technique_name '{' pass_list '}' KW_TECHNIQUE name_opt '{' pass_list '}'
{ {
if (!add_technique(ctx, $2, "technique", &@1)) if (!add_technique(ctx, $2, "technique", &@1))
YYABORT; YYABORT;
} }
technique10: technique10:
KW_TECHNIQUE10 technique_name '{' pass_list '}' KW_TECHNIQUE10 name_opt '{' pass_list '}'
{ {
if (ctx->profile->type == VKD3D_SHADER_TYPE_EFFECT && ctx->profile->major_version == 2) if (ctx->profile->type == VKD3D_SHADER_TYPE_EFFECT && ctx->profile->major_version == 2)
hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX,
@ -5177,7 +5177,7 @@ technique10:
} }
technique11: technique11:
KW_TECHNIQUE11 technique_name '{' pass_list '}' KW_TECHNIQUE11 name_opt '{' pass_list '}'
{ {
if (ctx->profile->type == VKD3D_SHADER_TYPE_EFFECT && ctx->profile->major_version == 2) if (ctx->profile->type == VKD3D_SHADER_TYPE_EFFECT && ctx->profile->major_version == 2)
hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX,