Nikolay Sivov : vkd3d-shader/hlsl: Rename the rule for an optional name.
Module: vkd3d Branch: master Commit: 0a6d842ed1890a2da75febbb0f1881e0ab44662e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0a6d842ed1890a2da75febbb0f1881... Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 11 00:32:40 2023 +0100 vkd3d-shader/hlsl: Rename the rule for an optional name. Names are optional for both techniques and passes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 7424e63a..7c77f0e8 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -5102,7 +5102,7 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls %type <name> any_identifier %type <name> var_identifier -%type <name> technique_name +%type <name> name_opt %type <parameter> parameter @@ -5148,7 +5148,7 @@ hlsl_prog: | hlsl_prog effect_group | hlsl_prog ';' -technique_name: +name_opt: %empty { $$ = NULL; @@ -5159,14 +5159,14 @@ pass_list: %empty technique9: - KW_TECHNIQUE technique_name '{' pass_list '}' + KW_TECHNIQUE name_opt '{' pass_list '}' { if (!add_technique(ctx, $2, "technique", &@1)) YYABORT; } 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) hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, @@ -5177,7 +5177,7 @@ technique10: } 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) hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX,
participants (1)
-
Alexandre Julliard