From: Zebediah Figura <zfigura(a)codeweavers.com> "opt" seems to imply "optional", but the optional aspect of these reservations is not (and never has been) encoded into these rules. --- libs/vkd3d-shader/hlsl.y | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 8f7155675..04b3cafeb 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -5683,8 +5683,8 @@ static bool state_block_add_entry(struct hlsl_state_block *state_block, struct h %type <parameters> param_list %type <parameters> parameters -%type <reg_reservation> register_opt -%type <reg_reservation> packoffset_opt +%type <reg_reservation> register_reservation +%type <reg_reservation> packoffset_reservation %type <sampler_dim> texture_type texture_ms_type uav_type rov_type @@ -6308,12 +6308,12 @@ colon_attribute: $$.reg_reservation.reg_type = 0; $$.reg_reservation.offset_type = 0; } - | register_opt + | register_reservation { $$.semantic = (struct hlsl_semantic){0}; $$.reg_reservation = $1; } - | packoffset_opt + | packoffset_reservation { $$.semantic = (struct hlsl_semantic){0}; $$.reg_reservation = $1; @@ -6335,7 +6335,7 @@ semantic: } /* FIXME: Writemasks */ -register_opt: +register_reservation: ':' KW_REGISTER '(' any_identifier ')' { $$ = parse_reg_reservation($4); @@ -6350,7 +6350,7 @@ register_opt: vkd3d_free($6); } -packoffset_opt: +packoffset_reservation: ':' KW_PACKOFFSET '(' any_identifier ')' { $$ = parse_packoffset(ctx, $4, NULL, &@$); -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/793