wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Rename register_opt and packoffset_opt to register_reservation and packoffset_reservation.

Browse Source 
"opt" seems to imply "optional", but the optional aspect of these reservations
is not (and never has been) encoded into these rules.
This commit is contained in:
Zebediah Figura 2023-08-28 17:21:34 -05:00 committed by Alexandre Julliard
parent 4a209efb62
commit 29f6a7e5f7
Notes: Alexandre Julliard 2024-04-22 23:37:43 +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/793
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5675,8 +5675,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
@ -6300,12 +6300,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;
@ -6327,7 +6327,7 @@ semantic:
}
/* FIXME: Writemasks */
register_opt:
register_reservation:
':' KW_REGISTER '(' any_identifier ')'
{
$$ = parse_reg_reservation($4);
@ -6342,7 +6342,7 @@ register_opt:
vkd3d_free($6);
}
packoffset_opt:
packoffset_reservation:
':' KW_PACKOFFSET '(' any_identifier ')'
{
$$ = parse_packoffset(ctx, $4, NULL, &@$);