- Wine-Commits - list.winehq.org

Conor McCarthy : vkd3d: Support 1D SRV.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: vkd3d Branch: master Commit: 0ce55e8b8eddc4db0c8fa57474fc4c15e794a293 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0ce55e8b8eddc4db0c8fa57474fc4… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 17 16:12:37 2023 +1000 vkd3d: Support 1D SRV. --- libs/vkd3d/resource.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 86b82b81..275e31b0 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2985,6 +2985,11 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, switch (desc->ViewDimension) { + case D3D12_SRV_DIMENSION_TEXTURE1D: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_1D; + vkd3d_desc.miplevel_idx = desc->u.Texture1D.MostDetailedMip; + vkd3d_desc.miplevel_count = desc->u.Texture1D.MipLevels; + break; case D3D12_SRV_DIMENSION_TEXTURE2D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; vkd3d_desc.miplevel_idx = desc->u.Texture2D.MostDetailedMip;

1 0

Conor McCarthy : tests: Test 1D UAV clear.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: vkd3d Branch: master Commit: 7d0aaea4f85c6e41940489767805cce4e65fcff3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7d0aaea4f85c6e41940489767805c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 17 13:57:14 2023 +1000 tests: Test 1D UAV clear. --- tests/d3d12.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 8a7e6b30..a5f11291 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5013,6 +5013,7 @@ static void test_clear_unordered_access_view_image(void) ID3D12Device *device; UINT clear_value[4]; HRESULT hr; + bool is_1d; #define IMAGE_SIZE 16 static const struct @@ -5087,6 +5088,7 @@ static void test_clear_unordered_access_view_image(void) } uav_dimensions[] = { + {D3D12_RESOURCE_DIMENSION_TEXTURE1D, D3D12_UAV_DIMENSION_TEXTURE1D, false}, {D3D12_RESOURCE_DIMENSION_TEXTURE2D, D3D12_UAV_DIMENSION_TEXTURE2D, false}, {D3D12_RESOURCE_DIMENSION_TEXTURE2D, D3D12_UAV_DIMENSION_TEXTURE2DARRAY, true }, /* Expected behaviour with partial layer coverage is unclear. */ @@ -5116,12 +5118,12 @@ static void test_clear_unordered_access_view_image(void) vkd3d_test_push_context("Dim %u, Test %u", d, i); + is_1d = uav_dimensions[d].resource_dim == D3D12_RESOURCE_DIMENSION_TEXTURE1D; + resource_desc.Dimension = uav_dimensions[d].resource_dim; resource_desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; resource_desc.Width = IMAGE_SIZE; - resource_desc.Height = IMAGE_SIZE; - if (uav_dimensions[d].resource_dim == D3D12_RESOURCE_DIMENSION_TEXTURE1D) - resource_desc.Height = 1; + resource_desc.Height = is_1d ? 1 : IMAGE_SIZE; resource_desc.DepthOrArraySize = tests[i].image_layers; resource_desc.MipLevels = tests[i].image_mips; resource_desc.Format = tests[i].format; @@ -5223,7 +5225,7 @@ static void test_clear_unordered_access_view_image(void) tests[i].mip_level + (layer * tests[i].image_mips), &rb, queue, command_list); - for (p = 0; p < image_depth * image_size * image_size; ++p) + for (p = 0; p < image_depth * (is_1d ? 1 : image_size) * image_size; ++p) { x = p % image_size; y = (p / image_size) % image_size; @@ -5252,7 +5254,7 @@ static void test_clear_unordered_access_view_image(void) actual_colour = get_readback_uint(&rb.rb, x, y, z); success = compare_color(actual_colour, expected_colour, tests[i].is_float ? 1 : 0); - todo_if(tests[i].is_todo && expected_colour) + todo_if((tests[i].is_todo || (is_1d && tests[i].mip_level)) && expected_colour) ok(success, "At layer %u, (%u,%u,%u), expected %#x, got %#x.\n", layer, x, y, z, expected_colour, actual_colour);

1 0

Conor McCarthy : vkd3d: Support 1D UAV.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: vkd3d Branch: master Commit: 6db9ed14dcc3b39e1a2ae4903849a6b02525b1e9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6db9ed14dcc3b39e1a2ae4903849a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 17 13:59:25 2023 +1000 vkd3d: Support 1D UAV. --- libs/vkd3d/resource.c | 3 +++ tests/d3d12.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index c282f116..86b82b81 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -3210,6 +3210,9 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, { switch (desc->ViewDimension) { + case D3D12_UAV_DIMENSION_TEXTURE1D: + vkd3d_desc.miplevel_idx = desc->u.Texture1D.MipSlice; + break; case D3D12_UAV_DIMENSION_TEXTURE2D: vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; if (desc->u.Texture2D.PlaneSlice) diff --git a/tests/d3d12.c b/tests/d3d12.c index a5f11291..ae16fddf 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5254,7 +5254,7 @@ static void test_clear_unordered_access_view_image(void) actual_colour = get_readback_uint(&rb.rb, x, y, z); success = compare_color(actual_colour, expected_colour, tests[i].is_float ? 1 : 0); - todo_if((tests[i].is_todo || (is_1d && tests[i].mip_level)) && expected_colour) + todo_if(tests[i].is_todo && expected_colour) ok(success, "At layer %u, (%u,%u,%u), expected %#x, got %#x.\n", layer, x, y, z, expected_colour, actual_colour);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_if().
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: vkd3d Branch: master Commit: 7ee66351c8e4cdf52f6c5e803d7584d270cb68e7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7ee66351c8e4cdf52f6c5e803d758… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 10 20:05:53 2022 -0600 vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_if(). --- libs/vkd3d-shader/hlsl.c | 8 ++++---- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 11 +++++------ libs/vkd3d-shader/hlsl_codegen.c | 13 ++++++------- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 9eccdd0e..5f683767 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1208,7 +1208,7 @@ struct hlsl_ir_node *hlsl_new_binary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_exp return hlsl_new_expr(ctx, op, operands, arg1->data_type, &arg1->loc); } -struct hlsl_ir_if *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condition, +struct hlsl_ir_node *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condition, struct hlsl_block *then_block, struct hlsl_block *else_block, const struct vkd3d_shader_location *loc) { struct hlsl_ir_if *iff; @@ -1222,7 +1222,7 @@ struct hlsl_ir_if *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condit hlsl_block_init(&iff->else_block); if (else_block) hlsl_block_add_block(&iff->else_block, else_block); - return iff; + return &iff->node; } struct hlsl_ir_load *hlsl_new_load_index(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, @@ -1521,7 +1521,7 @@ static struct hlsl_ir_node *clone_expr(struct hlsl_ctx *ctx, struct clone_instr_ static struct hlsl_ir_node *clone_if(struct hlsl_ctx *ctx, struct clone_instr_map *map, struct hlsl_ir_if *src) { struct hlsl_block then_block, else_block; - struct hlsl_ir_if *dst; + struct hlsl_ir_node *dst; if (!clone_block(ctx, &then_block, &src->then_block, map)) return NULL; @@ -1538,7 +1538,7 @@ static struct hlsl_ir_node *clone_if(struct hlsl_ctx *ctx, struct clone_instr_ma return NULL; } - return &dst->node; + return dst; } static struct hlsl_ir_node *clone_jump(struct hlsl_ctx *ctx, struct hlsl_ir_jump *src) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 16dcdb29..7a13c46f 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1067,7 +1067,7 @@ struct hlsl_ir_node *hlsl_new_float_constant(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hlsl_type *return_type, const struct hlsl_func_parameters *parameters, const struct hlsl_semantic *semantic, const struct vkd3d_shader_location *loc); -struct hlsl_ir_if *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condition, +struct hlsl_ir_node *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condition, struct hlsl_block *then_block, struct hlsl_block *else_block, const struct vkd3d_shader_location *loc); struct hlsl_ir_constant *hlsl_new_int_constant(struct hlsl_ctx *ctx, int n, const struct vkd3d_shader_location *loc); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4e7a4baa..45bc545f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -406,10 +406,9 @@ static DWORD add_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, DWORD mod, con static bool append_conditional_break(struct hlsl_ctx *ctx, struct list *cond_list) { - struct hlsl_ir_node *condition, *not; + struct hlsl_ir_node *condition, *not, *iff; struct hlsl_block then_block; struct hlsl_ir_jump *jump; - struct hlsl_ir_if *iff; /* E.g. "for (i = 0; ; ++i)". */ if (list_empty(cond_list)) @@ -428,7 +427,7 @@ static bool append_conditional_break(struct hlsl_ctx *ctx, struct list *cond_lis if (!(iff = hlsl_new_if(ctx, not, &then_block, NULL, &condition->loc))) return false; - list_add_tail(cond_list, &iff->node.entry); + list_add_tail(cond_list, &iff->entry); return true; } @@ -5245,7 +5244,7 @@ selection_statement: { struct hlsl_ir_node *condition = node_from_list($3); struct hlsl_block then_block, else_block; - struct hlsl_ir_if *instr; + struct hlsl_ir_node *instr; hlsl_block_init(&then_block); list_move_tail(&then_block.instrs, $5.then_block); @@ -5262,12 +5261,12 @@ selection_statement: struct vkd3d_string_buffer *string; if ((string = hlsl_type_to_string(ctx, condition->data_type))) - hlsl_error(ctx, &instr->node.loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + hlsl_error(ctx, &instr->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "if condition type %s is not scalar.", string->buffer); hlsl_release_string_buffer(ctx, string); } $$ = $3; - list_add_tail($$, &instr->node.entry); + list_add_tail($$, &instr->entry); } if_body: diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index e20abf83..d63bccdf 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -519,7 +519,7 @@ static void insert_early_return_break(struct hlsl_ctx *ctx, struct hlsl_block then_block; struct hlsl_ir_jump *jump; struct hlsl_ir_load *load; - struct hlsl_ir_if *iff; + struct hlsl_ir_node *iff; hlsl_block_init(&then_block); @@ -533,7 +533,7 @@ static void insert_early_return_break(struct hlsl_ctx *ctx, if (!(iff = hlsl_new_if(ctx, &load->node, &then_block, NULL, &cf_instr->loc))) return; - list_add_after(&load->node.entry, &iff->node.entry); + list_add_after(&load->node.entry, &iff->entry); } /* Remove HLSL_IR_JUMP_RETURN calls by altering subsequent control flow. */ @@ -678,10 +678,9 @@ static bool lower_return(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *fun else if (cf_instr) { struct list *tail = list_tail(&block->instrs); + struct hlsl_ir_node *not, *iff; struct hlsl_block then_block; struct hlsl_ir_load *load; - struct hlsl_ir_node *not; - struct hlsl_ir_if *iff; /* If we're in a loop, we should have used "break" instead. */ assert(!in_loop); @@ -703,7 +702,7 @@ static bool lower_return(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *fun if (!(iff = hlsl_new_if(ctx, not, &then_block, NULL, &cf_instr->loc))) return false; - list_add_tail(&block->instrs, &iff->node.entry); + list_add_tail(&block->instrs, &iff->entry); } return has_early_return; @@ -2006,8 +2005,8 @@ struct hlsl_ir_load *hlsl_add_conditional(struct hlsl_ctx *ctx, struct list *ins struct hlsl_block then_block, else_block; struct hlsl_ir_store *store; struct hlsl_ir_load *load; + struct hlsl_ir_node *iff; struct hlsl_ir_var *var; - struct hlsl_ir_if *iff; assert(hlsl_types_are_equal(if_true->data_type, if_false->data_type)); @@ -2027,7 +2026,7 @@ struct hlsl_ir_load *hlsl_add_conditional(struct hlsl_ctx *ctx, struct list *ins if (!(iff = hlsl_new_if(ctx, condition, &then_block, &else_block, &condition->loc))) return NULL; - list_add_tail(instrs, &iff->node.entry); + list_add_tail(instrs, &iff->entry); if (!(load = hlsl_new_var_load(ctx, var, condition->loc))) return NULL;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Introduce a hlsl_block_cleanup() helper.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: vkd3d Branch: master Commit: 733141720aa728e28ecfa5b924c2b5669e6cf895 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/733141720aa728e28ecfa5b924c2b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 14 13:02:15 2023 -0500 vkd3d-shader/hlsl: Introduce a hlsl_block_cleanup() helper. --- libs/vkd3d-shader/hlsl.c | 19 ++++++++++++------- libs/vkd3d-shader/hlsl.h | 1 + 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 449a22e4..7f71b565 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -553,7 +553,7 @@ static bool init_deref_from_component_index(struct hlsl_ctx *ctx, struct hlsl_bl if (!(c = hlsl_new_uint_constant(ctx, next_index, loc))) { - hlsl_free_instr_list(&block->instrs); + hlsl_block_cleanup(block); return false; } hlsl_block_add_instr(block, &c->node); @@ -1426,7 +1426,7 @@ static bool clone_block(struct hlsl_ctx *ctx, struct hlsl_block *dst_block, { if (!(dst = clone_instr(ctx, map, src))) { - hlsl_free_instr_list(&dst_block->instrs); + hlsl_block_cleanup(dst_block); return false; } list_add_tail(&dst_block->instrs, &dst->entry); @@ -1435,7 +1435,7 @@ static bool clone_block(struct hlsl_ctx *ctx, struct hlsl_block *dst_block, { if (!vkd3d_array_reserve((void **)&map->instrs, &map->capacity, map->count + 1, sizeof(*map->instrs))) { - hlsl_free_instr_list(&dst_block->instrs); + hlsl_block_cleanup(dst_block); return false; } @@ -2577,6 +2577,11 @@ void hlsl_free_instr_list(struct list *list) hlsl_free_instr(node); } +void hlsl_block_cleanup(struct hlsl_block *block) +{ + hlsl_free_instr_list(&block->instrs); +} + static void free_ir_call(struct hlsl_ir_call *call) { vkd3d_free(call); @@ -2598,8 +2603,8 @@ static void free_ir_expr(struct hlsl_ir_expr *expr) static void free_ir_if(struct hlsl_ir_if *if_node) { - hlsl_free_instr_list(&if_node->then_instrs.instrs); - hlsl_free_instr_list(&if_node->else_instrs.instrs); + hlsl_block_cleanup(&if_node->then_instrs); + hlsl_block_cleanup(&if_node->else_instrs); hlsl_src_remove(&if_node->condition); vkd3d_free(if_node); } @@ -2617,7 +2622,7 @@ static void free_ir_load(struct hlsl_ir_load *load) static void free_ir_loop(struct hlsl_ir_loop *loop) { - hlsl_free_instr_list(&loop->body.instrs); + hlsl_block_cleanup(&loop->body); vkd3d_free(loop); } @@ -2741,7 +2746,7 @@ static void free_function_decl(struct hlsl_ir_function_decl *decl) vkd3d_free((void *)decl->attrs); vkd3d_free(decl->parameters.vars); - hlsl_free_instr_list(&decl->body.instrs); + hlsl_block_cleanup(&decl->body); vkd3d_free(decl); } diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index cabbf1de..0016da76 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1014,6 +1014,7 @@ struct hlsl_ir_load *hlsl_add_conditional(struct hlsl_ctx *ctx, struct list *ins void hlsl_add_function(struct hlsl_ctx *ctx, char *name, struct hlsl_ir_function_decl *decl); bool hlsl_add_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local_var); +void hlsl_block_cleanup(struct hlsl_block *block); bool hlsl_clone_block(struct hlsl_ctx *ctx, struct hlsl_block *dst_block, const struct hlsl_block *src_block); void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *func);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_cast() and hlsl_new_copy().
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: vkd3d Branch: master Commit: b23ef3ca3bcc041997efddcc74c9e7dc55bacdc2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b23ef3ca3bcc041997efddcc74c9e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 10 19:39:42 2022 -0600 vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_cast() and hlsl_new_copy(). --- libs/vkd3d-shader/hlsl.c | 6 ++--- libs/vkd3d-shader/hlsl.h | 4 ++-- libs/vkd3d-shader/hlsl.y | 29 ++++++++++++------------- libs/vkd3d-shader/hlsl_codegen.c | 47 +++++++++++++++++++--------------------- 4 files changed, 41 insertions(+), 45 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Initialize the block in clone_block().
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: vkd3d Branch: master Commit: 5a3fe1609b127372ea1d601772fd2c296a21d2f6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5a3fe1609b127372ea1d601772fd2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 14 12:57:02 2023 -0500 vkd3d-shader/hlsl: Initialize the block in clone_block(). --- libs/vkd3d-shader/hlsl.c | 2 ++ libs/vkd3d-shader/hlsl_codegen.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 7f71b565..3ee97ca6 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1422,6 +1422,8 @@ static bool clone_block(struct hlsl_ctx *ctx, struct hlsl_block *dst_block, const struct hlsl_ir_node *src; struct hlsl_ir_node *dst; + hlsl_block_init(dst_block); + LIST_FOR_EACH_ENTRY(src, &src_block->instrs, struct hlsl_ir_node, entry) { if (!(dst = clone_instr(ctx, map, src))) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index c41e88ec..8bde17fe 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -721,7 +721,6 @@ static bool lower_calls(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void * hlsl_error(ctx, &call->node.loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Function \"%s\" is not defined.", decl->func->name); - hlsl_block_init(&block); if (!hlsl_clone_block(ctx, &block, &decl->body)) return false; list_move_before(&call->node.entry, &block.instrs);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass hlsl_block pointers to hlsl_new_if().
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: vkd3d Branch: master Commit: 50f0ae1b2176d0202da8dccd6e139815d319c206 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/50f0ae1b2176d0202da8dccd6e139… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 10 20:04:22 2022 -0600 vkd3d-shader/hlsl: Pass hlsl_block pointers to hlsl_new_if(). --- libs/vkd3d-shader/hlsl.c | 35 ++++++++++++------- libs/vkd3d-shader/hlsl.h | 7 ++-- libs/vkd3d-shader/hlsl.y | 39 ++++++++++++--------- libs/vkd3d-shader/hlsl_codegen.c | 74 ++++++++++++++++++++++------------------ libs/vkd3d-shader/hlsl_sm4.c | 6 ++-- 5 files changed, 94 insertions(+), 67 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_float_constant().
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: vkd3d Branch: master Commit: dc7514afc9f7e945b8693ef65e27d035fee1495d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dc7514afc9f7e945b8693ef65e27d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 10 19:45:51 2022 -0600 vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_float_constant(). --- libs/vkd3d-shader/hlsl.c | 4 +-- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 64 ++++++++++++++++++---------------------- libs/vkd3d-shader/hlsl_codegen.c | 7 ++--- 4 files changed, 34 insertions(+), 43 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_bool_constant().
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: vkd3d Branch: master Commit: 1bf3aa927530c7ff43ed07638f2fbda06c8ad25b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1bf3aa927530c7ff43ed07638f2fb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 10 19:37:41 2022 -0600 vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_bool_constant(). --- libs/vkd3d-shader/hlsl.c | 10 +++++----- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 6 +++--- libs/vkd3d-shader/hlsl_codegen.c | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 869638a6..2ec04ef4 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1128,14 +1128,14 @@ struct hlsl_ir_constant *hlsl_new_constant(struct hlsl_ctx *ctx, struct hlsl_typ return c; } -struct hlsl_ir_constant *hlsl_new_bool_constant(struct hlsl_ctx *ctx, bool b, const struct vkd3d_shader_location *loc) +struct hlsl_ir_node *hlsl_new_bool_constant(struct hlsl_ctx *ctx, bool b, const struct vkd3d_shader_location *loc) { struct hlsl_ir_constant *c; if ((c = hlsl_new_constant(ctx, hlsl_get_scalar_type(ctx, HLSL_TYPE_BOOL), loc))) c->value[0].u = b ? ~0u : 0; - return c; + return &c->node; } struct hlsl_ir_constant *hlsl_new_float_constant(struct hlsl_ctx *ctx, float f, @@ -1711,7 +1711,7 @@ struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, const struct vkd3d_shader_location *loc) { struct hlsl_ir_function_decl *decl; - struct hlsl_ir_constant *constant; + struct hlsl_ir_node *constant; struct hlsl_ir_store *store; if (!(decl = hlsl_alloc(ctx, sizeof(*decl)))) @@ -1737,9 +1737,9 @@ struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, if (!(constant = hlsl_new_bool_constant(ctx, false, loc))) return decl; - hlsl_block_add_instr(&decl->body, &constant->node); + hlsl_block_add_instr(&decl->body, constant); - if (!(store = hlsl_new_simple_store(ctx, decl->early_return_var, &constant->node))) + if (!(store = hlsl_new_simple_store(ctx, decl->early_return_var, constant))) return decl; hlsl_block_add_instr(&decl->body, &store->node); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index b38fba1c..68f27abc 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1048,7 +1048,7 @@ const char *hlsl_jump_type_to_string(enum hlsl_ir_jump_type type); struct hlsl_type *hlsl_new_array_type(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, unsigned int array_size); struct hlsl_ir_node *hlsl_new_binary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2); -struct hlsl_ir_constant *hlsl_new_bool_constant(struct hlsl_ctx *ctx, bool b, const struct vkd3d_shader_location *loc); +struct hlsl_ir_node *hlsl_new_bool_constant(struct hlsl_ctx *ctx, bool b, const struct vkd3d_shader_location *loc); struct hlsl_buffer *hlsl_new_buffer(struct hlsl_ctx *ctx, enum hlsl_buffer_type type, const char *name, const struct hlsl_reg_reservation *reservation, struct vkd3d_shader_location loc); struct hlsl_ir_node *hlsl_new_call(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *decl, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 0ddae6ee..ad0a784c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -5350,13 +5350,13 @@ primary_expr: } | boolean { - struct hlsl_ir_constant *c; + struct hlsl_ir_node *c; if (!(c = hlsl_new_bool_constant(ctx, $1, &@1))) YYABORT; - if (!($$ = make_list(ctx, &c->node))) + if (!($$ = make_list(ctx, c))) { - hlsl_free_instr(&c->node); + hlsl_free_instr(c); YYABORT; } } diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index adaf8201..c698672b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -628,18 +628,18 @@ static bool lower_return(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *fun else if (instr->type == HLSL_IR_JUMP) { struct hlsl_ir_jump *jump = hlsl_ir_jump(instr); - struct hlsl_ir_constant *constant; + struct hlsl_ir_node *constant; struct hlsl_ir_store *store; if (jump->type == HLSL_IR_JUMP_RETURN) { if (!(constant = hlsl_new_bool_constant(ctx, true, &jump->node.loc))) return false; - list_add_before(&jump->node.entry, &constant->node.entry); + list_add_before(&jump->node.entry, &constant->entry); - if (!(store = hlsl_new_simple_store(ctx, func->early_return_var, &constant->node))) + if (!(store = hlsl_new_simple_store(ctx, func->early_return_var, constant))) return false; - list_add_after(&constant->node.entry, &store->node.entry); + list_add_after(&constant->entry, &store->node.entry); has_early_return = true; if (in_loop)

1 0