Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
vkd3d
Manage
Activity
Members
Labels
Plan
Wiki
Bugzilla
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
wine
vkd3d
Commits
833c897a
Commit
833c897a
authored
3 years ago
by
Elizabeth Figura
Committed by
Alexandre Julliard
11 months ago
Browse files
Options
Downloads
Patches
Plain Diff
vkd3d-shader/hlsl: Parse register space reservations.
parent
29f6a7e5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!793
hlsl: Parse profile and register space reservations.
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libs/vkd3d-shader/hlsl.h
+1
-1
1 addition, 1 deletion
libs/vkd3d-shader/hlsl.h
libs/vkd3d-shader/hlsl.y
+48
-12
48 additions, 12 deletions
libs/vkd3d-shader/hlsl.y
with
49 additions
and
13 deletions
libs/vkd3d-shader/hlsl.h
+
1
−
1
View file @
833c897a
...
...
@@ -392,7 +392,7 @@ struct hlsl_attribute
struct
hlsl_reg_reservation
{
char
reg_type
;
unsigned
int
reg_index
;
unsigned
int
reg_space
,
reg_index
;
char
offset_type
;
unsigned
int
offset_index
;
...
...
This diff is collapsed.
Click to expand it.
libs/vkd3d-shader/hlsl.y
+
48
−
12
View file @
833c897a
...
...
@@ -1197,17 +1197,18 @@ static bool add_effect_group(struct hlsl_ctx *ctx, const char *name, struct hlsl
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))
{
FIXME("Unsupported register reservation syntax.\n");
return reservation;
}
reservation.reg_type = ascii_tolower(reg_string[0]);
return
reservation
;
*type = ascii_tolower(string[0]);
return true;
}
static bool parse_reservation_space(const char *string, uint32_t *space)
{
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,
...
...
@@ -6330,16 +6331,51 @@ semantic:
register_reservation:
':' 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);
}
| ':' KW_REGISTER '(' any_identifier ',' any_identifier ')'
{
FIXME("Ignoring shader target %s in a register reservation.\n", debugstr_a($4));
memset(&$$, 0, sizeof($$));
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);
}
vkd3d_free($4);
vkd3d_free($6);
}
| ':' KW_REGISTER '(' any_identifier ',' any_identifier ',' any_identifier ')'
{
hlsl_fixme(ctx, &@4, "Reservation shader target %s.", $4);
$$ = parse_reg_reservation($6);
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:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment