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
79dd9544
Commit
79dd9544
authored
2 years ago
by
Elizabeth Figura
Committed by
Alexandre Julliard
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
vkd3d-shader/hlsl: Return a hlsl_block from the "loop_statement" rule.
parent
23ff83e8
No related branches found
No related tags found
1 merge request
!258
hlsl: Replace bare list pointers with hlsl_block, part 2.
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libs/vkd3d-shader/hlsl.y
+4
-6
4 additions, 6 deletions
libs/vkd3d-shader/hlsl.y
with
4 additions
and
6 deletions
libs/vkd3d-shader/hlsl.y
+
4
−
6
View file @
79dd9544
...
...
@@ -486,7 +486,8 @@ static bool attribute_list_has_duplicates(const struct parse_attribute_list *att
return false;
}
static struct list *create_loop(struct hlsl_ctx *ctx, enum loop_type type, const struct parse_attribute_list *attributes, struct list *init, struct list *cond,
static struct hlsl_block *create_loop(struct hlsl_ctx *ctx, enum loop_type type,
const struct parse_attribute_list *attributes, struct list *init, struct list *cond,
struct list *iter, struct hlsl_block *body, const struct vkd3d_shader_location *loc)
{
struct hlsl_ir_node *loop;
...
...
@@ -542,7 +543,7 @@ static struct list *create_loop(struct hlsl_ctx *ctx, enum loop_type type, const
vkd3d_free(cond);
destroy_block(body);
return init;
return
list_to_block(
init
)
;
oom:
destroy_instr_list(init);
...
...
@@ -4571,7 +4572,6 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type
%type <list> jump_statement
%type <list> logicand_expr
%type <list> logicor_expr
%type <list> loop_statement
%type <list> mul_expr
%type <list> postfix_expr
%type <list> primary_expr
...
...
@@ -4599,6 +4599,7 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type
%type <attr_list> attribute_list_optional
%type <block> compound_statement
%type <block> loop_statement
%type <block> statement
%type <block> statement_list
...
...
@@ -5932,9 +5933,6 @@ statement:
$$ = list_to_block($1);
}
| loop_statement
{
$$ = list_to_block($1);
}
jump_statement:
KW_RETURN expr ';'
...
...
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