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: Parse register space reservations.

Browse Source
This commit is contained in:
Zebediah Figura 2021-08-16 21:01:51 -05:00 committed by Alexandre Julliard
parent 29f6a7e5f7
commit 833c897aac
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
2 changed files with 50 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/vkd3d-shader/hlsl.h
View File

@ -392,7 +392,7 @@ struct hlsl_attribute
struct hlsl_reg_reservation struct hlsl_reg_reservation
{ {
char reg_type; char reg_type;
unsigned int reg_index; unsigned int reg_space, reg_index;
char offset_type; char offset_type;
unsigned int offset_index; unsigned int offset_index;

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

@ -1197,17 +1197,18 @@ static bool add_effect_group(struct hlsl_ctx *ctx, const char *name, struct hlsl
return true; return true;
} }
static struct hlsl_reg_reservation parse_reg_reservation(const char *reg_string) static bool parse_reservation_index(const char *string, char *type, uint32_t *index)
{ {
struct hlsl_reg_reservation reservation = {0}; if (!sscanf(string + 1, "%u", index))
return false;
if (!sscanf(reg_string + 1, "%u", &reservation.reg_index)) *type = ascii_tolower(string[0]);
{ return true;
FIXME("Unsupported register reservation syntax.\n"); }
return reservation;
} static bool parse_reservation_space(const char *string, uint32_t *space)
reservation.reg_type = ascii_tolower(reg_string[0]); {
return reservation; return !ascii_strncasecmp(string, "space", 5) && sscanf(string + 5, "%u", space);
} }
static struct hlsl_reg_reservation parse_packoffset(struct hlsl_ctx *ctx, const char *reg_string, static struct hlsl_reg_reservation parse_packoffset(struct hlsl_ctx *ctx, const char *reg_string,
@ -6330,17 +6331,52 @@ semantic:
register_reservation: register_reservation:
':' KW_REGISTER '(' any_identifier ')' ':' KW_REGISTER '(' any_identifier ')'
{ {
$$ = parse_reg_reservation($4); memset(&$$, 0, sizeof($$));
if (!parse_reservation_index($4, &$$.reg_type, &$$.reg_index))
hlsl_error(ctx, &@4, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION,
"Invalid register reservation '%s'.", $4);
vkd3d_free($4); vkd3d_free($4);
} }
| ':' KW_REGISTER '(' any_identifier ',' any_identifier ')' | ':' KW_REGISTER '(' any_identifier ',' any_identifier ')'
{ {
FIXME("Ignoring shader target %s in a register reservation.\n", debugstr_a($4)); memset(&$$, 0, sizeof($$));
vkd3d_free($4); if (parse_reservation_index($6, &$$.reg_type, &$$.reg_index))
{
hlsl_fixme(ctx, &@4, "Reservation shader target %s.", $4);
}
else if (parse_reservation_space($6, &$$.reg_space))
{
if (!parse_reservation_index($4, &$$.reg_type, &$$.reg_index))
hlsl_error(ctx, &@4, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION,
"Invalid register reservation '%s'.", $4);
}
else
{
hlsl_error(ctx, &@6, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION,
"Invalid register or space reservation '%s'.", $6);
}
$$ = parse_reg_reservation($6); vkd3d_free($4);
vkd3d_free($6); vkd3d_free($6);
} }
| ':' KW_REGISTER '(' any_identifier ',' any_identifier ',' any_identifier ')'
{
hlsl_fixme(ctx, &@4, "Reservation shader target %s.", $4);
memset(&$$, 0, sizeof($$));
if (!parse_reservation_index($6, &$$.reg_type, &$$.reg_index))
hlsl_error(ctx, &@6, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION,
"Invalid register reservation '%s'.", $6);
if (!parse_reservation_space($8, &$$.reg_space))
hlsl_error(ctx, &@8, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION,
"Invalid register space reservation '%s'.", $8);
vkd3d_free($4);
vkd3d_free($6);
vkd3d_free($8);
}
packoffset_reservation: packoffset_reservation:
':' KW_PACKOFFSET '(' any_identifier ')' ':' KW_PACKOFFSET '(' any_identifier ')'