January 2022 - Wine-commits

Zebediah Figura : vkd3d-shader/hlsl: Use list_empty() instead of comparing list_count() against zero.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: vkd3d Branch: master Commit: 833bfa88124114e7521a3bfd7d54934b63811b95 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=833bfa88124114e7521a3bf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 19 12:51:59 2022 +0100 vkd3d-shader/hlsl: Use list_empty() instead of comparing list_count() against zero. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 636882c..5a17449 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -326,7 +326,7 @@ static bool append_conditional_break(struct hlsl_ctx *ctx, struct list *cond_lis struct hlsl_ir_if *iff; /* E.g. "for (i = 0; ; ++i)". */ - if (!list_count(cond_list)) + if (list_empty(cond_list)) return true; condition = node_from_list(cond_list);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Fold constant casts from int to uint.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: vkd3d Branch: master Commit: 8ced37058d01e34b98383d5e1890447792648f25 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8ced37058d01e34b98383d5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 19 12:52:00 2022 +0100 vkd3d-shader/hlsl: Fold constant casts from int to uint. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 75716bd..e43e637 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -724,6 +724,31 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi { switch (expr->op) { + case HLSL_OP1_CAST: + if (instr->data_type->dimx != arg1->node.data_type->dimx + || instr->data_type->dimy != arg1->node.data_type->dimy) + { + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), + debug_hlsl_type(ctx, instr->data_type)); + vkd3d_free(res); + return false; + } + + switch (arg1->node.data_type->base_type) + { + case HLSL_TYPE_INT: + for (i = 0; i < dimx; ++i) + res->value[i].i = arg1->value[i].u; + break; + + default: + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), + debug_hlsl_type(ctx, instr->data_type)); + vkd3d_free(res); + return false; + } + break; + case HLSL_OP1_NEG: for (i = 0; i < instr->data_type->dimx; ++i) res->value[i].u = -arg1->value[i].u;

1 0

Zebediah Figura : tests: Test redefining intrinsic functions.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: vkd3d Branch: master Commit: 6b5e44435fec44de7703222599f1ad798389e4c5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6b5e44435fec44de7703222… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 19 12:52:01 2022 +0100 tests: Test redefining intrinsic functions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ tests/hlsl-intrinsic-override.shader_test | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/Makefile.am b/Makefile.am index 20fee06..0c2fbf7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ vkd3d_shader_tests = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-intrinsic-override.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ @@ -293,6 +294,7 @@ XFAIL_TESTS = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-intrinsic-override.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-nested-arrays.shader_test \ diff --git a/tests/hlsl-intrinsic-override.shader_test b/tests/hlsl-intrinsic-override.shader_test new file mode 100644 index 0000000..55a23f2 --- /dev/null +++ b/tests/hlsl-intrinsic-override.shader_test @@ -0,0 +1,31 @@ +[pixel shader] + +float2 max(float2 a, float2 b) +{ + return a + b; +} + +float4 main() : sv_target +{ + return float4(max(0.1, 0.2), max(float2(0.1, 0.2), float2(0.3, 0.4))); +} + +[test] +draw quad +probe all rgba (0.3, 0.3, 0.4, 0.6) + +[pixel shader] + +float2 max(float2 a, float3 b) +{ + return a + b.xy; +} + +float4 main() : sv_target +{ + return float4(max(0.1, 0.2), max(float2(0.1, 0.2), float2(0.3, 0.4))); +} + +[test] +draw quad +probe all rgba (0.3, 0.3, 0.3, 0.4)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 equality instructions.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: vkd3d Branch: master Commit: f23415f4b590b70c81fc8bbeaeebef8daeff3eba URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f23415f4b590b70c81fc8bb… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jan 19 12:52:02 2022 +0100 vkd3d-shader/hlsl: Write SM4 equality instructions. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 2458018..90bb32e 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1489,6 +1489,41 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_TYPE_BOOL: + { + switch (expr->op) + { + case HLSL_OP2_EQUAL: + { + const struct hlsl_type *src_type = arg1->data_type; + + switch (src_type->base_type) + { + case HLSL_TYPE_FLOAT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_EQ, &expr->node, arg1, arg2); + break; + + case HLSL_TYPE_BOOL: + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_IEQ, &expr->node, arg1, arg2); + break; + + default: + hlsl_fixme(ctx, &expr->node.loc, "SM4 equality between \"%s\" operands.", + debug_hlsl_type(ctx, src_type)); + break; + } + break; + } + + default: + hlsl_fixme(ctx, &expr->node.loc, "SM4 bool \"%s\" expression.", debug_hlsl_expr_op(expr->op)); + break; + } + break; + } + default: { struct vkd3d_string_buffer *string;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 inequality instructions.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: vkd3d Branch: master Commit: 1db9dab156cff28975d6c9b071ecd4e8c3e7f0b7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1db9dab156cff28975d6c9b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jan 19 12:52:03 2022 +0100 vkd3d-shader/hlsl: Write SM4 inequality instructions. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 90bb32e..53dca71 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1517,6 +1517,30 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_OP2_NEQUAL: + { + const struct hlsl_type *src_type = arg1->data_type; + + switch (src_type->base_type) + { + case HLSL_TYPE_FLOAT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_NE, &expr->node, arg1, arg2); + break; + + case HLSL_TYPE_BOOL: + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_INE, &expr->node, arg1, arg2); + break; + + default: + hlsl_fixme(ctx, &expr->node.loc, "SM4 inequality between \"%s\" operands.", + debug_hlsl_type(ctx, src_type)); + break; + } + break; + } + default: hlsl_fixme(ctx, &expr->node.loc, "SM4 bool \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 less-than instructions.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: vkd3d Branch: master Commit: 2f3b1e8f7da95897caf3c2a84cc1b8709b6a44eb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2f3b1e8f7da95897caf3c2a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jan 19 12:52:04 2022 +0100 vkd3d-shader/hlsl: Write SM4 less-than instructions. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 53dca71..cbdd5fa 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1541,6 +1541,33 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_OP2_LESS: + { + const struct hlsl_type *src_type = arg1->data_type; + + switch (src_type->base_type) + { + case HLSL_TYPE_FLOAT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_LT, &expr->node, arg1, arg2); + break; + + case HLSL_TYPE_INT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_ILT, &expr->node, arg1, arg2); + break; + + case HLSL_TYPE_BOOL: + case HLSL_TYPE_UINT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_ULT, &expr->node, arg1, arg2); + break; + + default: + hlsl_fixme(ctx, &expr->node.loc, "SM4 less-than between \"%s\" operands.", + debug_hlsl_type(ctx, src_type)); + break; + } + break; + } + default: hlsl_fixme(ctx, &expr->node.loc, "SM4 bool \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 greater-or-equal instructions.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: vkd3d Branch: master Commit: 9182e73e649c631417b7e1ebb04e405dedd89866 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9182e73e649c631417b7e1e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jan 19 12:52:05 2022 +0100 vkd3d-shader/hlsl: Write SM4 greater-or-equal instructions. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index cbdd5fa..8fc4e73 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1568,6 +1568,33 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_OP2_GEQUAL: + { + const struct hlsl_type *src_type = arg1->data_type; + + switch (src_type->base_type) + { + case HLSL_TYPE_FLOAT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_GE, &expr->node, arg1, arg2); + break; + + case HLSL_TYPE_INT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_IGE, &expr->node, arg1, arg2); + break; + + case HLSL_TYPE_BOOL: + case HLSL_TYPE_UINT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_UGE, &expr->node, arg1, arg2); + break; + + default: + hlsl_fixme(ctx, &expr->node.loc, "SM4 greater-than-or-equal between \"%s\" operands.", + debug_hlsl_type(ctx, src_type)); + break; + } + break; + } + default: hlsl_fixme(ctx, &expr->node.loc, "SM4 bool \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Remove HLSL_OP2_GREATER and HLSL_OP2_LEQUAL.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: vkd3d Branch: master Commit: 2d619f3d5293c5778b9884d7757bc39c97896ba0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2d619f3d5293c5778b9884d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jan 19 12:52:06 2022 +0100 vkd3d-shader/hlsl: Remove HLSL_OP2_GREATER and HLSL_OP2_LEQUAL. They are replaced with HLSL_OP2_LESS and HLSL_OP2_GEQUAL after swapping the parameters. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl.c | 2 -- libs/vkd3d-shader/hlsl.h | 2 -- libs/vkd3d-shader/hlsl.y | 4 ++-- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0c2fbf7..a3ec685 100644 --- a/Makefile.am +++ b/Makefile.am @@ -288,7 +288,6 @@ XFAIL_TESTS = \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ tests/cast-to-uint.shader_test \ - tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index d2ea4c3..8ae3130 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1198,8 +1198,6 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP2_DOT] = "dot", [HLSL_OP2_EQUAL] = "==", [HLSL_OP2_GEQUAL] = ">=", - [HLSL_OP2_GREATER] = ">", - [HLSL_OP2_LEQUAL] = "<=", [HLSL_OP2_LESS] = "<", [HLSL_OP2_LOGIC_AND] = "&&", [HLSL_OP2_LOGIC_OR] = "||", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 57acf3a..6aec0b0 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -316,8 +316,6 @@ enum hlsl_ir_expr_op HLSL_OP2_DOT, HLSL_OP2_EQUAL, HLSL_OP2_GEQUAL, - HLSL_OP2_GREATER, - HLSL_OP2_LEQUAL, HLSL_OP2_LESS, HLSL_OP2_LOGIC_AND, HLSL_OP2_LOGIC_OR, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5a17449..cff56a7 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3422,11 +3422,11 @@ relational_expr: } | relational_expr '>' shift_expr { - $$ = add_binary_comparison_expr_merge(ctx, $1, $3, HLSL_OP2_GREATER, @2); + $$ = add_binary_comparison_expr_merge(ctx, $3, $1, HLSL_OP2_LESS, @2); } | relational_expr OP_LE shift_expr { - $$ = add_binary_comparison_expr_merge(ctx, $1, $3, HLSL_OP2_LEQUAL, @2); + $$ = add_binary_comparison_expr_merge(ctx, $3, $1, HLSL_OP2_GEQUAL, @2); } | relational_expr OP_GE shift_expr {

1 0

Conor McCarthy : vkd3d: Store the vkd3d format in resource objects.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: vkd3d Branch: master Commit: 1f3ec35138edf770ac7e2465da6295e313f79137 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1f3ec35138edf770ac7e246… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 18 14:52:09 2022 +1000 vkd3d: Store the vkd3d format in resource objects. Resource formats are immutable and the format object is static data. Storing it saves a function call and error check in many locations. The current implementation for finding a format iterates over the entire list of formats. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 9 +-------- libs/vkd3d/resource.c | 3 +++ libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 353a61c..421a3c8 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2116,17 +2116,10 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info; VkPipelineStageFlags src_stage_mask, dst_stage_mask; - const struct vkd3d_format *format; VkImageMemoryBarrier barrier; assert(d3d12_resource_is_texture(resource)); - if (!(format = vkd3d_format_from_d3d12_resource_desc(list->device, &resource->desc, 0))) - { - ERR("Resource %p has invalid format %#x.\n", resource, resource->desc.Format); - return; - } - barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; barrier.pNext = NULL; @@ -2146,7 +2139,7 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.image = resource->u.vk_image; - barrier.subresourceRange.aspectMask = format->vk_aspect_mask; + barrier.subresourceRange.aspectMask = resource->format->vk_aspect_mask; barrier.subresourceRange.baseMipLevel = 0; barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS; barrier.subresourceRange.baseArrayLayer = 0; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 78b32bd..b376ecd 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1778,6 +1778,8 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 if (FAILED(hr = d3d12_resource_validate_desc(&resource->desc, device))) return hr; + resource->format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0); + switch (desc->Dimension) { case D3D12_RESOURCE_DIMENSION_BUFFER: @@ -2030,6 +2032,7 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, object->refcount = 1; object->internal_refcount = 1; object->desc = create_info->desc; + object->format = vkd3d_format_from_d3d12_resource_desc(d3d12_device, &create_info->desc, 0); object->u.vk_image = create_info->vk_image; object->flags = VKD3D_RESOURCE_EXTERNAL; object->flags |= create_info->flags & VKD3D_RESOURCE_PUBLIC_FLAGS; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 3f5ea21..aa18fcb 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -430,6 +430,7 @@ struct d3d12_resource LONG internal_refcount; D3D12_RESOURCE_DESC desc; + const struct vkd3d_format *format; D3D12_GPU_VIRTUAL_ADDRESS gpu_address; union

1 0

Conor McCarthy : vkd3d: Use the resource's stored format in d3d12_command_list_ResourceBarrier().
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: vkd3d Branch: master Commit: 16393e10d5ca668449069ff0458950f18311497f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=16393e10d5ca668449069ff… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 18 14:52:10 2022 +1000 vkd3d: Use the resource's stored format in d3d12_command_list_ResourceBarrier(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 421a3c8..9ea9d7f 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4057,15 +4057,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC } else { - const struct vkd3d_format *format; VkImageMemoryBarrier vk_barrier; - if (!(format = vkd3d_format_from_d3d12_resource_desc(list->device, &resource->desc, 0))) - { - ERR("Resource %p has invalid format %#x.\n", resource, resource->desc.Format); - continue; - } - vk_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; vk_barrier.pNext = NULL; vk_barrier.srcAccessMask = src_access_mask; @@ -4076,7 +4069,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.image = resource->u.vk_image; - vk_barrier.subresourceRange.aspectMask = format->vk_aspect_mask; + vk_barrier.subresourceRange.aspectMask = resource->format->vk_aspect_mask; if (sub_resource_idx == D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES) { vk_barrier.subresourceRange.baseMipLevel = 0;

1 0