January 2024 - Wine-Commits

Zebediah Figura : vkd3d-shader/hlsl: Forbid objects in ternary conditions.
by Alexandre Julliard Jan. 18, 2024

Jan. 18, 2024

Module: vkd3d Branch: master Commit: 2c8751478ff9c46d9aa6ff82cc9aa4200ae1aa4f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2c8751478ff9c46d9aa6ff82cc9aa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 11 14:06:00 2023 -0600 vkd3d-shader/hlsl: Forbid objects in ternary conditions. --- libs/vkd3d-shader/hlsl.y | 10 ++++++++++ tests/hlsl/ternary.shader_test | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index e30b3dc5..5552db11 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4091,6 +4091,16 @@ static bool add_ternary(struct hlsl_ctx *ctx, struct hlsl_block *block, struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {0}; struct hlsl_type *common_type; + if (cond->data_type->class > HLSL_CLASS_LAST_NUMERIC) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, cond->data_type))) + hlsl_error(ctx, &cond->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Ternary condition type '%s' is not numeric.", string->buffer); + hlsl_release_string_buffer(ctx, string); + } + if (first->data_type->class <= HLSL_CLASS_LAST_NUMERIC && second->data_type->class <= HLSL_CLASS_LAST_NUMERIC) { diff --git a/tests/hlsl/ternary.shader_test b/tests/hlsl/ternary.shader_test index 50f40201..f4fffb29 100644 --- a/tests/hlsl/ternary.shader_test +++ b/tests/hlsl/ternary.shader_test @@ -353,7 +353,7 @@ float4 main() : sv_target % Of course objects cannot be used as the condition. -[pixel shader fail todo] +[pixel shader fail] Texture2D t; float4 main() : sv_target

1 0

Conor McCarthy : tests: Test an interpolated PS input where component x is unused.
by Alexandre Julliard Jan. 18, 2024

Jan. 18, 2024

Module: vkd3d Branch: master Commit: 759362b52709aad82755b6e81f2f7685741ee340 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/759362b52709aad82755b6e81f2f7… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jan 8 13:48:24 2024 +1000 tests: Test an interpolated PS input where component x is unused. FXC does not emit an interpolation mode for unused elements. --- tests/d3d12.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 6bdb5f7a..e0fc3cf6 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -37827,6 +37827,130 @@ static void test_hull_shader_punned_array(void) destroy_test_context(&context); } +static void test_unused_interpolated_input(void) +{ + ID3D12GraphicsCommandList *command_list; + D3D12_INPUT_LAYOUT_DESC input_layout; + struct d3d12_resource_readback rb; + struct test_context_desc desc; + D3D12_VERTEX_BUFFER_VIEW vbv; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Resource *buffer; + + static const DWORD vs_code[] = + { +#if 0 + void main(float4 in_position : POSITION, float4 in_color : COLOR, + out float4 out_position : SV_POSITION, out float2 out_color_xy : COLOR0, + out float2 out_color_zw : COLOR1) + { + out_position = in_position; + out_color_xy = in_color.xy; + out_color_zw = in_color.zw; + } +#endif + 0x43425844, 0x300ab133, 0x7ab911f3, 0x18c8bc61, 0x7a2eb5e9, 0x00000001, 0x00000168, 0x00000003, + 0x0000002c, 0x0000007c, 0x000000e8, 0x4e475349, 0x00000048, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000041, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0x4c4f4300, 0xab00524f, 0x4e47534f, + 0x00000064, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x0000005c, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000c03, 0x0000005c, + 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000030c, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4f4c4f43, 0xabab0052, 0x58454853, 0x00000078, 0x00010050, 0x0000001e, 0x0100086a, 0x0300005f, + 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x04000067, 0x001020f2, 0x00000000, + 0x00000001, 0x03000065, 0x00102032, 0x00000001, 0x03000065, 0x001020c2, 0x00000001, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, + 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const DWORD ps_code[] = + { + /* Compiled with fxc, this results in a single input register split into two signature + * elements, xy and zw, where xy is unused and has default interpolation. */ +#if 0 + void main(float4 in_position : SV_POSITION, nointerpolation float2 in_color_xy : COLOR0, + nointerpolation float2 in_color_zw : COLOR1, out float4 out_color : SV_TARGET) + { + /* in_color_xy is unused */ + out_color.xy = in_color_zw; + out_color.zw = in_color_zw; + } +#endif + 0x43425844, 0xeb0d015d, 0x5dc78d0f, 0x0e0a87d1, 0x93ea3988, 0x00000001, 0x00000110, 0x00000003, + 0x0000002c, 0x00000098, 0x000000cc, 0x4e475349, 0x00000064, 0x00000003, 0x00000008, 0x00000050, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000005c, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000003, 0x0000005c, 0x00000001, 0x00000000, 0x00000003, 0x00000001, + 0x00000c0c, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x4e47534f, 0x0000002c, + 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, + 0x545f5653, 0x45475241, 0xabab0054, 0x58454853, 0x0000003c, 0x00000050, 0x0000000f, 0x0100086a, + 0x03000862, 0x001010c2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, 0x001020f2, + 0x00000000, 0x00101ee6, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const D3D12_BOX box = {8, 8, 0, 9, 9, 1}; + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 8, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const struct + { + struct vec2 position; + struct vec4 color; + } + quad[] = + { + {{-1.0f, -1.0f}, {0.0f, 1.0f, 0.0f, 1.0f}}, + {{-1.0f, 1.0f}, {0.0f, 1.0f, 0.0f, 1.0f}}, + {{ 1.0f, -1.0f}, {1.0f, 0.0f, 1.0f, 0.0f}}, + {{ 1.0f, 1.0f}, {0.0f, 1.0f, 0.0f, 1.0f}}, + }; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + context.root_signature = create_empty_root_signature(context.device, + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT); + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout); + + buffer = create_upload_buffer(context.device, sizeof(quad), quad); + + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(buffer); + vbv.StrideInBytes = sizeof(*quad); + vbv.SizeInBytes = sizeof(quad); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_resource_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); + todo + check_readback_data_uint(&rb.rb, &box, 0xff00ff00, 0); + release_resource_readback(&rb); + + ID3D12Resource_Release(buffer); + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -38009,4 +38133,5 @@ START_TEST(d3d12) run_test(test_vs_ps_relative_addressing); run_test(test_get_resource_tiling); run_test(test_hull_shader_punned_array); + run_test(test_unused_interpolated_input); }

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle the DXIL BR instruction conditional variant.
by Alexandre Julliard Jan. 18, 2024

Jan. 18, 2024

Module: vkd3d Branch: master Commit: 8a5804eb43ec81584f608e688231a1540ea14a81 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8a5804eb43ec81584f608e688231a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Nov 24 11:21:06 2023 +1000 vkd3d-shader/dxil: Handle the DXIL BR instruction conditional variant. --- libs/vkd3d-shader/dxil.c | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 4bc16b21..f54af4c3 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -475,13 +475,16 @@ struct sm6_symbol enum sm6_block_terminator_type { TERMINATOR_UNCOND_BR, + TERMINATOR_COND_BR, TERMINATOR_RET, }; struct sm6_block_terminator { + struct vkd3d_shader_register conditional_reg; enum sm6_block_terminator_type type; const struct sm6_block *true_block; + const struct sm6_block *false_block; }; struct sm6_block @@ -3328,6 +3331,9 @@ static const struct sm6_block *sm6_function_get_block(const struct sm6_function static void sm6_parser_emit_br(struct sm6_parser *sm6, const struct dxil_record *record, struct sm6_function *function, struct sm6_block *code_block, struct vkd3d_shader_instruction *ins) { + const struct sm6_value *value; + unsigned int i = 2; + if (record->operand_count != 1 && record->operand_count < 3) { WARN("Invalid operand count %u.\n", record->operand_count); @@ -3343,9 +3349,22 @@ static void sm6_parser_emit_br(struct sm6_parser *sm6, const struct dxil_record } else { - FIXME("Conditional branch is not implemented.\n"); - vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND_COUNT, - "Conditional branch is not implemented."); + if (!sm6->bool_type) + { + WARN("Bool type not found.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_MODULE, + "Module does not define a boolean type for conditions."); + return; + } + if (!(value = sm6_parser_get_value_by_ref(sm6, record, sm6->bool_type, &i)) + || !sm6_value_validate_is_bool(value, sm6)) + return; + dxil_record_validate_operand_max_count(record, i, sm6); + + code_block->terminator.type = TERMINATOR_COND_BR; + code_block->terminator.conditional_reg = value->u.reg; + code_block->terminator.true_block = sm6_function_get_block(function, record->operands[0], sm6); + code_block->terminator.false_block = sm6_function_get_block(function, record->operands[1], sm6); } ins->handler_idx = VKD3DSIH_NOP; @@ -4902,6 +4921,18 @@ static void sm6_block_emit_terminator(const struct sm6_block *block, struct sm6_ vsir_src_param_init_label(&src_params[0], block->terminator.true_block->id); break; + case TERMINATOR_COND_BR: + if (!block->terminator.true_block || !block->terminator.false_block) + return; + ins = sm6_parser_add_instruction(sm6, VKD3DSIH_BRANCH); + if (!(src_params = instruction_src_params_alloc(ins, 3, sm6))) + return; + src_param_init(&src_params[0]); + src_params[0].reg = block->terminator.conditional_reg; + vsir_src_param_init_label(&src_params[1], block->terminator.true_block->id); + vsir_src_param_init_label(&src_params[2], block->terminator.false_block->id); + break; + case TERMINATOR_RET: sm6_parser_add_instruction(sm6, VKD3DSIH_RET); break;

1 0

Giovanni Mascellani : tests: Add a test with non-trivial control flow.
by Alexandre Julliard Jan. 18, 2024

Jan. 18, 2024

Module: vkd3d Branch: master Commit: 6cb7487fb02e92a205acde2805361cb93e10bc77 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6cb7487fb02e92a205acde2805361… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jan 15 12:08:56 2024 +0100 tests: Add a test with non-trivial control flow. --- tests/hlsl/for.shader_test | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tests/hlsl/for.shader_test b/tests/hlsl/for.shader_test index 9407c81b..7abd2067 100644 --- a/tests/hlsl/for.shader_test +++ b/tests/hlsl/for.shader_test @@ -28,6 +28,40 @@ probe ( 0, 0, 159, 480) rgba (10.0, 35.0, 0.0, 0.0) probe (161, 0, 479, 480) rgba (10.0, 38.0, 0.0, 0.0) probe (481, 0, 640, 480) rgba ( 5.0, 10.0, 0.0, 0.0) +[require] +shader model >= 4.0 + +% Identical to the previous, except we prevent DXC from unrolling the +% loop so we can test non-trivial control flow +[pixel shader] +uniform uint iter; + +float4 main(float tex : texcoord) : sv_target +{ + int i; + float x = 0.0; + for (i = 0; i < iter; i++) + { + x += i; + if (tex > 0.5 && i == 5) + break; + if (tex > -0.5 && i >= 7) + continue; + x -= 1; + } + return float4(i, x, 0.0, 0.0); +} + +[test] +uniform 0 uint4 10 0 0 0 +todo(sm>=6) draw quad +probe ( 0, 0, 159, 480) rgba (10.0, 35.0, 0.0, 0.0) +probe (161, 0, 479, 480) rgba (10.0, 38.0, 0.0, 0.0) +probe (481, 0, 640, 480) rgba ( 5.0, 10.0, 0.0, 0.0) + +[require] +% Reset requirements + [pixel shader] float4 main(float tex : texcoord) : sv_target {

1 0

Giovanni Mascellani : tests: Test a couple of degenerate switch instances.
by Alexandre Julliard Jan. 18, 2024

Jan. 18, 2024

Module: vkd3d Branch: master Commit: 93100edb4b994db084fe4914d88f8abe62d0fb9f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/93100edb4b994db084fe4914d88f8… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jan 12 10:47:21 2024 +0100 tests: Test a couple of degenerate switch instances. --- tests/hlsl/switch.shader_test | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/tests/hlsl/switch.shader_test b/tests/hlsl/switch.shader_test index b7edadcc..01624f97 100644 --- a/tests/hlsl/switch.shader_test +++ b/tests/hlsl/switch.shader_test @@ -28,6 +28,41 @@ uniform 0 uint4 0 0 0 0 draw quad probe all rgba (3.0, 3.0, 3.0, 3.0) +% just a default case +[pixel shader] +uint4 v; + +float4 main() : sv_target +{ + switch (v.x) + { + default: + return 5.0; + } +} + +[test] +uniform 0 uint4 3 0 0 0 +draw quad +probe all rgba (5.0, 5.0, 5.0, 5.0) +uniform 0 uint4 1 0 0 0 +draw quad +probe all rgba (5.0, 5.0, 5.0, 5.0) +uniform 0 uint4 0 0 0 0 +draw quad +probe all rgba (5.0, 5.0, 5.0, 5.0) + +% completely empty +[pixel shader fail] +uint4 v; + +float4 main() : sv_target +{ + switch (v.x) + { + } +} + % falling through is only supported for empty case statements [pixel shader] uint4 v;

1 0

Conor McCarthy : vkd3d-shader/ir: Set merged signature element interpolation mode only from used elements.
by Alexandre Julliard Jan. 18, 2024

Jan. 18, 2024

Module: vkd3d Branch: master Commit: 83851133c539e73a06d36a41b99b402d223aaeae URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/83851133c539e73a06d36a41b99b4… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jan 8 13:52:46 2024 +1000 vkd3d-shader/ir: Set merged signature element interpolation mode only from used elements. --- libs/vkd3d-shader/ir.c | 13 +++++++++++++ tests/d3d12.c | 1 - 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index efbfa4b8..d3b19818 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -840,6 +840,7 @@ static bool shader_signature_merge(struct shader_signature *s, uint8_t range_map unsigned int i, j, element_count, new_count, register_count; struct signature_element *elements; struct signature_element *e, *f; + bool used; element_count = s->element_count; if (!(elements = vkd3d_malloc(element_count * sizeof(*elements)))) @@ -860,6 +861,8 @@ static bool shader_signature_merge(struct shader_signature *s, uint8_t range_map if (range_map_get_register_count(range_map, e->register_index, e->mask) > 1) continue; + used = e->used_mask; + for (; j < element_count; ++j) { f = &elements[j]; @@ -877,6 +880,16 @@ static bool shader_signature_merge(struct shader_signature *s, uint8_t range_map e->mask |= f->mask; e->used_mask |= f->used_mask; e->semantic_index = min(e->semantic_index, f->semantic_index); + + /* The first element may have no interpolation mode if it is unused. Elements which + * actually have different interpolation modes are assigned different registers. */ + if (f->used_mask && !used) + { + if (e->interpolation_mode && e->interpolation_mode != f->interpolation_mode) + FIXME("Mismatching interpolation modes %u and %u.\n", e->interpolation_mode, f->interpolation_mode); + else + e->interpolation_mode = f->interpolation_mode; + } } } element_count = new_count; diff --git a/tests/d3d12.c b/tests/d3d12.c index e0fc3cf6..d2638f31 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -37943,7 +37943,6 @@ static void test_unused_interpolated_input(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_resource_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - todo check_readback_data_uint(&rb.rb, &box, 0xff00ff00, 0); release_resource_readback(&rb);

1 0

Giovanni Mascellani : vkd3d-shader: Make relative address sources mutable too.
by Alexandre Julliard Jan. 18, 2024

Jan. 18, 2024

Module: vkd3d Branch: master Commit: 38fdf240026a32609f450227cfcb1bba2534b50e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/38fdf240026a32609f450227cfcb1… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jan 17 16:10:17 2024 +0100 vkd3d-shader: Make relative address sources mutable too. They were forgotten in 78d95889bd49c6028f0c26aaec5589786381da4a. Fixes: 78d95889bd49c6028f0c26aaec5589786381da4a --- libs/vkd3d-shader/d3dbc.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index aa0dd8f4..dcd51035 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -444,7 +444,7 @@ static uint32_t swizzle_from_sm1(uint32_t swizzle) shader_sm1_get_swizzle_component(swizzle, 3)); } -static void shader_sm1_parse_src_param(uint32_t param, const struct vkd3d_shader_src_param *rel_addr, +static void shader_sm1_parse_src_param(uint32_t param, struct vkd3d_shader_src_param *rel_addr, struct vkd3d_shader_src_param *src) { enum vkd3d_shader_register_type reg_type = ((param & VKD3D_SM1_REGISTER_TYPE_MASK) >> VKD3D_SM1_REGISTER_TYPE_SHIFT) @@ -465,7 +465,7 @@ static void shader_sm1_parse_src_param(uint32_t param, const struct vkd3d_shader src->modifiers = (param & VKD3D_SM1_SRC_MODIFIER_MASK) >> VKD3D_SM1_SRC_MODIFIER_SHIFT; } -static void shader_sm1_parse_dst_param(uint32_t param, const struct vkd3d_shader_src_param *rel_addr, +static void shader_sm1_parse_dst_param(uint32_t param, struct vkd3d_shader_src_param *rel_addr, struct vkd3d_shader_dst_param *dst) { enum vkd3d_shader_register_type reg_type = ((param & VKD3D_SM1_REGISTER_TYPE_MASK) >> VKD3D_SM1_REGISTER_TYPE_SHIFT) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 09cb34ee..c7f181eb 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -827,7 +827,7 @@ struct vkd3d_shader_indexable_temp struct vkd3d_shader_register_index { - const struct vkd3d_shader_src_param *rel_addr; + struct vkd3d_shader_src_param *rel_addr; unsigned int offset; /* address is known to fall within the object (for optimisation) */ bool is_in_bounds;

1 0

Conor McCarthy : vkd3d-shader/ir: Revert "Do not merge signature elements which have different interpolation modes.".
by Alexandre Julliard Jan. 18, 2024

Jan. 18, 2024

Module: vkd3d Branch: master Commit: b8280e4210df8504870410cb40eec3ff15867372 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b8280e4210df8504870410cb40eec… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jan 4 11:23:16 2024 +1000 vkd3d-shader/ir: Revert "Do not merge signature elements which have different interpolation modes.". This reverts commit b5c067b41a173e2ab252d5a3588f807c3ade5b2a. The commit causes regressions in other shaders because unused elements do not have an interpolation mode. --- libs/vkd3d-shader/ir.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index ab4aa60f..efbfa4b8 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -865,9 +865,8 @@ static bool shader_signature_merge(struct shader_signature *s, uint8_t range_map f = &elements[j]; /* Merge different components of the same register unless sysvals are different, - * interpolation modes are different, or it will be relative-addressed. */ + * or it will be relative-addressed. */ if (f->register_index != e->register_index || f->sysval_semantic != e->sysval_semantic - || f->interpolation_mode != e->interpolation_mode || range_map_get_register_count(range_map, f->register_index, f->mask) > 1) break;

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle the DXIL PHI instruction.
by Alexandre Julliard Jan. 18, 2024

Jan. 18, 2024

Module: vkd3d Branch: master Commit: ba1ee27b4b8134f71f267981721f07c4d7624db4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ba1ee27b4b8134f71f267981721f0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Nov 24 11:23:09 2023 +1000 vkd3d-shader/dxil: Handle the DXIL PHI instruction. --- libs/vkd3d-shader/d3d_asm.c | 1 + libs/vkd3d-shader/dxil.c | 235 ++++++++++++++++++++++++++++++- libs/vkd3d-shader/spirv.c | 7 +- libs/vkd3d-shader/vkd3d_shader_private.h | 6 + 4 files changed, 245 insertions(+), 4 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle the DXIL SWITCH instruction.
by Alexandre Julliard Jan. 18, 2024

Jan. 18, 2024

Module: vkd3d Branch: master Commit: efe800f7f044389673d0da060e9d79540d574c64 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/efe800f7f044389673d0da060e9d7… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Nov 24 13:14:44 2023 +1000 vkd3d-shader/dxil: Handle the DXIL SWITCH instruction. --- libs/vkd3d-shader/d3d_asm.c | 13 +++ libs/vkd3d-shader/dxil.c | 153 +++++++++++++++++++++++++++++++ libs/vkd3d-shader/ir.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 + 4 files changed, 169 insertions(+), 1 deletion(-)

1 0