wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Factor out hlsl_new_copy().

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura
2021-03-16 16:31:52 -05:00
committed by Alexandre Julliard
parent 80cac66b6f
commit 8096e4ae7b
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/vkd3d-shader/hlsl.c
View File

@@ -382,6 +382,12 @@ struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ir_node *node, struct hlsl_type *
return hlsl_ir_expr(cast); return hlsl_ir_expr(cast);
} }
struct hlsl_ir_expr *hlsl_new_copy(struct hlsl_ir_node *node)
{
/* Use a cast to the same type as a makeshift identity expression. */
return hlsl_new_cast(node, node->data_type, &node->loc);
}
struct hlsl_ir_var *hlsl_new_var(const char *name, struct hlsl_type *type, const struct vkd3d_shader_location loc, struct hlsl_ir_var *hlsl_new_var(const char *name, struct hlsl_type *type, const struct vkd3d_shader_location loc,
const char *semantic, unsigned int modifiers, const struct hlsl_reg_reservation *reg_reservation) const char *semantic, unsigned int modifiers, const struct hlsl_reg_reservation *reg_reservation)
{ {

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

@@ -525,6 +525,7 @@ struct hlsl_ir_node *hlsl_new_binary_expr(enum hlsl_ir_expr_op op, struct hlsl_i
struct hlsl_ir_node *arg2) DECLSPEC_HIDDEN; struct hlsl_ir_node *arg2) DECLSPEC_HIDDEN;
struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ir_node *node, struct hlsl_type *type,
struct vkd3d_shader_location *loc) DECLSPEC_HIDDEN; struct vkd3d_shader_location *loc) DECLSPEC_HIDDEN;
struct hlsl_ir_expr *hlsl_new_copy(struct hlsl_ir_node *node) DECLSPEC_HIDDEN;
struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hlsl_type *return_type, struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hlsl_type *return_type,
struct list *parameters, const char *semantic, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct list *parameters, const char *semantic, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN;
struct hlsl_ir_if *hlsl_new_if(struct hlsl_ir_node *condition, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_if *hlsl_new_if(struct hlsl_ir_node *condition, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN;

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

@@ -1336,9 +1336,8 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in
/* Don't use the instruction itself as a source, as this makes structure /* Don't use the instruction itself as a source, as this makes structure
* splitting easier. Instead copy it here. Since we retrieve sources from * splitting easier. Instead copy it here. Since we retrieve sources from
* the last instruction in the list, we do need to copy. Use a cast * the last instruction in the list, we do need to copy. */
* instruction to the same type as a makeshift identity expression. */ if (!(copy = hlsl_new_copy(rhs)))
if (!(copy = hlsl_new_cast(rhs, rhs->data_type, &lhs->loc)))
return NULL; return NULL;
list_add_tail(instrs, &copy->node.entry); list_add_tail(instrs, &copy->node.entry);
return &copy->node; return &copy->node;
@@ -1365,8 +1364,7 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem
{ {
struct hlsl_ir_expr *copy; struct hlsl_ir_expr *copy;
/* Use a cast to the same type as a makeshift identity expression. */ if (!(copy = hlsl_new_copy(lhs)))
if (!(copy = hlsl_new_cast(lhs, lhs->data_type, &lhs->loc)))
return false; return false;
list_add_tail(instrs, &copy->node.entry); list_add_tail(instrs, &copy->node.entry);