wine-commits November 2023

wine-commits@winehq.org

1 participants
989 discussions

Nikolay Sivov : tests: Add some tests for loop attributes.
by Alexandre Julliard 01 Nov '23

01 Nov '23

Module: vkd3d Branch: master Commit: b8047fd650edade927f0d95fade06c2aa8924417 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b8047fd650edade927f0d95fade06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 28 20:52:46 2023 +0200 tests: Add some tests for loop attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/hlsl/loop.shader_test | 143 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) diff --git a/tests/hlsl/loop.shader_test b/tests/hlsl/loop.shader_test index 4fbf14d8..3d515c9d 100644 --- a/tests/hlsl/loop.shader_test +++ b/tests/hlsl/loop.shader_test @@ -100,3 +100,146 @@ float4 main() : sv_target uniform 0 float 4.0 todo(sm>=6) draw quad probe all rgba (410.1, 410.1, 410.1, 410.1) + +% loop attribute by itself +[pixel shader todo] +float4 main() : sv_target +{ + float ret = 0.0; + + [loop] for (int i = 0; i < 10; ++i) + { + ret += 1.0; + } + + return ret; +} + +[test] +todo draw quad +probe all rgba (10.0, 10.0, 10.0, 10.0) + +[pixel shader todo] +float4 main() : sv_target +{ + float ret = 0.0; + int i = 0; + + [loop] while (i < 10) + { + ret += 1.0; + i++; + } + + return ret; +} + +[test] +todo draw quad +probe all rgba (10.0, 10.0, 10.0, 10.0) + +[pixel shader todo] +float4 main() : sv_target +{ + float ret = 0.0; + int i = 0; + + [loop] do + { + i++; + ret += 1.0; + } while (i < 10); + + return ret; +} + +[test] +todo draw quad +probe all rgba (10.0, 10.0, 10.0, 10.0) + +% unroll can't be used with fastopt or loop +[pixel shader fail todo] +float4 main() : sv_target +{ + float ret = 0.0; + + [loop] [unroll(1)] for (int i = 0; i < 10; ++i) + { + ret += 1.0; + } + + return ret; +} + +[pixel shader fail todo] +float4 main() : sv_target +{ + float ret = 0.0; + + [fastopt] [unroll(1)] for (int i = 0; i < 10; ++i) + { + ret += 1.0; + } + + return ret; +} + +[pixel shader fail todo] +float4 main() : sv_target +{ + float ret = 0.0; + int i = 0; + + [loop] [unroll(1)] while (i < 10) + { + ret += 1.0; + i++; + } + + return ret; +} + +[pixel shader fail todo] +float4 main() : sv_target +{ + float ret = 0.0; + int i = 0; + + [fastopt] [unroll(1)] while (i < 10) + { + ret += 1.0; + i++; + } + + return ret; +} + +[pixel shader fail] +float4 main() : sv_target +{ + float ret = 0.0; + int i = 0; + + [loop] [unroll(1)] do + { + ret += 1.0; + i++; + } while (i < 10) + + return ret; +} + +[pixel shader fail] +float4 main() : sv_target +{ + float ret = 0.0; + int i = 0; + + [fastopt] [unroll(1)] do + { + ret += 1.0; + i++; + } while (i < 10) + + return ret; +}

1 0

Giovanni Mascellani : tests: Immediately transition buffers after creation in the shader runner.
by Alexandre Julliard 01 Nov '23

01 Nov '23

Module: vkd3d Branch: master Commit: c691ad8869abda68038c225c98e5f1bec8b98efa URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c691ad8869abda68038c225c98e5f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Oct 31 14:00:35 2023 +0100 tests: Immediately transition buffers after creation in the shader runner. The resource could be destructed before the command list left open is executed; instead, we immediately perform the transition. --- tests/d3d12_test_utils.h | 21 ++++++++++++++++++--- tests/shader_runner_d3d12.c | 7 +++---- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 3c3e50ca..7473bbc4 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -773,9 +773,10 @@ static inline void upload_texture_data_(unsigned int line, ID3D12Resource *textu RESOURCE_STATE_DO_NOT_CHANGE, RESOURCE_STATE_DO_NOT_CHANGE); } -#define upload_buffer_data(a, b, c, d, e, f) upload_buffer_data_(__LINE__, a, b, c, d, e, f) -static inline void upload_buffer_data_(unsigned int line, ID3D12Resource *buffer, size_t offset, - size_t size, const void *data, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) +#define upload_buffer_data_with_states(a, b, c, d, e, f, g, h) upload_buffer_data_with_states_(__LINE__, a, b, c, d, e, f, g, h) +static inline void upload_buffer_data_with_states_(unsigned int line, ID3D12Resource *buffer, size_t offset, + size_t size, const void *data, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, + D3D12_RESOURCE_STATES initial_state, D3D12_RESOURCE_STATES final_state) { ID3D12Resource *upload_buffer; ID3D12Device *device; @@ -786,9 +787,15 @@ static inline void upload_buffer_data_(unsigned int line, ID3D12Resource *buffer upload_buffer = create_upload_buffer_(line, device, size, data); + if (initial_state != RESOURCE_STATE_DO_NOT_CHANGE) + transition_resource_state(command_list, buffer, initial_state, D3D12_RESOURCE_STATE_COPY_DEST); + ID3D12GraphicsCommandList_CopyBufferRegion(command_list, buffer, offset, upload_buffer, 0, size); + if (final_state != RESOURCE_STATE_DO_NOT_CHANGE) + transition_resource_state(command_list, buffer, D3D12_RESOURCE_STATE_COPY_DEST, final_state); + hr = ID3D12GraphicsCommandList_Close(command_list); ok_(line)(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr); exec_command_list(queue, command_list); @@ -798,6 +805,14 @@ static inline void upload_buffer_data_(unsigned int line, ID3D12Resource *buffer ID3D12Device_Release(device); } +#define upload_buffer_data(a, b, c, d, e, f) upload_buffer_data_(__LINE__, a, b, c, d, e, f) +static inline void upload_buffer_data_(unsigned int line, ID3D12Resource *buffer, size_t offset, + size_t size, const void *data, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) +{ + return upload_buffer_data_with_states_(line, buffer, offset, size, data, queue, command_list, + RESOURCE_STATE_DO_NOT_CHANGE, RESOURCE_STATE_DO_NOT_CHANGE); +} + static HRESULT create_root_signature(ID3D12Device *device, const D3D12_ROOT_SIGNATURE_DESC *desc, ID3D12RootSignature **root_signature) { diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 6c71b90f..a05dfd05 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -181,11 +181,10 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co resource->resource = create_default_buffer(device, params->data_size, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); - upload_buffer_data(resource->resource, 0, params->data_size, resource_data, - test_context->queue, test_context->list); + upload_buffer_data_with_states(resource->resource, 0, params->data_size, resource_data, + test_context->queue, test_context->list, + RESOURCE_STATE_DO_NOT_CHANGE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); reset_command_list(test_context->list, test_context->allocator); - transition_resource_state(test_context->list, resource->resource, - D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); uav_desc.Format = params->format; uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER;

1 0

Giovanni Mascellani : tests: Immediately transition textures after creation in the shader runner.
by Alexandre Julliard 01 Nov '23

01 Nov '23

Module: vkd3d Branch: master Commit: 46b7fccfd7e6a08e037d5335225df7f81d170610 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/46b7fccfd7e6a08e037d5335225df… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Oct 31 13:53:00 2023 +0100 tests: Immediately transition textures after creation in the shader runner. The resource could be destructed before the command list left open is executed; instead, we immediately perform the transition. --- tests/d3d12_test_utils.h | 28 +++++++++++++++++++++++++--- tests/shader_runner_d3d12.c | 15 +++++++-------- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index f0c4b411..3c3e50ca 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -671,10 +671,11 @@ static void copy_sub_resource_data(const D3D12_MEMCPY_DEST *dst, const D3D12_SUB } } -#define upload_texture_data(a, b, c, d, e) upload_texture_data_(__LINE__, a, b, c, d, e) -static inline void upload_texture_data_(unsigned int line, ID3D12Resource *texture, +#define upload_texture_data_with_states(a, b, c, d, e, f, g) upload_texture_data_with_states_(__LINE__, a, b, c, d, e, f, g) +static inline void upload_texture_data_with_states_(unsigned int line, ID3D12Resource *texture, const D3D12_SUBRESOURCE_DATA *data, unsigned int sub_resource_count, - ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) + ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, + D3D12_RESOURCE_STATES initial_state, D3D12_RESOURCE_STATES final_state) { D3D12_TEXTURE_COPY_LOCATION dst_location, src_location; D3D12_PLACED_SUBRESOURCE_FOOTPRINT *layouts; @@ -718,7 +719,13 @@ static inline void upload_texture_data_(unsigned int line, ID3D12Resource *textu if (resource_desc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER) { + if (initial_state != RESOURCE_STATE_DO_NOT_CHANGE) + transition_resource_state(command_list, texture, initial_state, D3D12_RESOURCE_STATE_COPY_DEST); + ID3D12GraphicsCommandList_CopyResource(command_list, texture, upload_buffer); + + if (final_state != RESOURCE_STATE_DO_NOT_CHANGE) + transition_resource_state(command_list, texture, D3D12_RESOURCE_STATE_COPY_DEST, final_state); } else { @@ -732,8 +739,14 @@ static inline void upload_texture_data_(unsigned int line, ID3D12Resource *textu src_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT; src_location.PlacedFootprint = layouts[i]; + if (initial_state != RESOURCE_STATE_DO_NOT_CHANGE) + transition_sub_resource_state(command_list, texture, i, initial_state, D3D12_RESOURCE_STATE_COPY_DEST); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 0, 0, 0, &src_location, NULL); + + if (final_state != RESOURCE_STATE_DO_NOT_CHANGE) + transition_sub_resource_state(command_list, texture, i, D3D12_RESOURCE_STATE_COPY_DEST, final_state); } } @@ -751,6 +764,15 @@ static inline void upload_texture_data_(unsigned int line, ID3D12Resource *textu free(row_sizes); } +#define upload_texture_data(a, b, c, d, e) upload_texture_data_(__LINE__, a, b, c, d, e) +static inline void upload_texture_data_(unsigned int line, ID3D12Resource *texture, + const D3D12_SUBRESOURCE_DATA *data, unsigned int sub_resource_count, + ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) +{ + return upload_texture_data_with_states_(line, texture, data, sub_resource_count, queue, command_list, + RESOURCE_STATE_DO_NOT_CHANGE, RESOURCE_STATE_DO_NOT_CHANGE); +} + #define upload_buffer_data(a, b, c, d, e, f) upload_buffer_data_(__LINE__, a, b, c, d, e, f) static inline void upload_buffer_data_(unsigned int line, ID3D12Resource *buffer, size_t offset, size_t size, const void *data, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 79d637e6..6c71b90f 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -147,11 +147,11 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co resource->resource = create_default_texture2d(device, params->width, params->height, 1, params->level_count, params->format, 0, D3D12_RESOURCE_STATE_COPY_DEST); - upload_texture_data(resource->resource, resource_data, - params->level_count, test_context->queue, test_context->list); - reset_command_list(test_context->list, test_context->allocator); - transition_resource_state(test_context->list, resource->resource, D3D12_RESOURCE_STATE_COPY_DEST, + upload_texture_data_with_states(resource->resource, resource_data, + params->level_count, test_context->queue, test_context->list, + RESOURCE_STATE_DO_NOT_CHANGE, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + reset_command_list(test_context->list, test_context->allocator); ID3D12Device_CreateShaderResourceView(device, resource->resource, NULL, get_cpu_descriptor_handle(test_context, runner->heap, resource->r.slot)); break; @@ -163,11 +163,10 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co resource->resource = create_default_texture2d(device, params->width, params->height, 1, params->level_count, params->format, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); - upload_texture_data(resource->resource, resource_data, - params->level_count, test_context->queue, test_context->list); + upload_texture_data_with_states(resource->resource, resource_data, + params->level_count, test_context->queue, test_context->list, + RESOURCE_STATE_DO_NOT_CHANGE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); reset_command_list(test_context->list, test_context->allocator); - transition_resource_state(test_context->list, resource->resource, - D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); ID3D12Device_CreateUnorderedAccessView(device, resource->resource, NULL, NULL, get_cpu_descriptor_handle(test_context, runner->heap, resource->r.slot + MAX_RESOURCES)); break;

1 0

Giovanni Mascellani : tests: Immediately transition resources after readback in the shader runner.
by Alexandre Julliard 01 Nov '23

01 Nov '23

Module: vkd3d Branch: master Commit: ca7fa0c0150fd0defb1459ac74f58e393e341a78 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ca7fa0c0150fd0defb1459ac74f58… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Oct 23 21:53:51 2023 +0200 tests: Immediately transition resources after readback in the shader runner. The resource could be destructed before the command list left open is executed; instead, we immediately perform the transition. --- tests/d3d12_test_utils.h | 21 +++++++++++++++++++-- tests/shader_runner_d3d12.c | 8 ++------ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 2c7b10f4..f0c4b411 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -415,8 +415,11 @@ struct d3d12_resource_readback ID3D12Resource *resource; }; -static void get_resource_readback_with_command_list(ID3D12Resource *resource, unsigned int sub_resource, - struct d3d12_resource_readback *rb, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) +#define RESOURCE_STATE_DO_NOT_CHANGE (~0u) + +static void get_resource_readback_with_command_list_and_states(ID3D12Resource *resource, unsigned int sub_resource, + struct d3d12_resource_readback *rb, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, + D3D12_RESOURCE_STATES initial_state, D3D12_RESOURCE_STATES final_state) { D3D12_HEAP_PROPERTIES heap_properties; D3D12_RESOURCE_DESC resource_desc; @@ -444,6 +447,9 @@ static void get_resource_readback_with_command_list(ID3D12Resource *resource, un rb->rb.row_pitch = align(rb->rb.row_pitch, D3D12_TEXTURE_DATA_PITCH_ALIGNMENT); rb->rb.data = NULL; + if (initial_state != RESOURCE_STATE_DO_NOT_CHANGE) + transition_sub_resource_state(command_list, resource, sub_resource, initial_state, D3D12_RESOURCE_STATE_COPY_SOURCE); + src_resource = resource; if (resource_desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER && resource_desc.SampleDesc.Count > 1) { @@ -493,6 +499,10 @@ static void get_resource_readback_with_command_list(ID3D12Resource *resource, un ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 0, 0, 0, &src_location, NULL); } + + if (final_state != RESOURCE_STATE_DO_NOT_CHANGE) + transition_sub_resource_state(command_list, resource, sub_resource, D3D12_RESOURCE_STATE_COPY_SOURCE, final_state); + hr = ID3D12GraphicsCommandList_Close(command_list); assert_that(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); @@ -509,6 +519,13 @@ static void get_resource_readback_with_command_list(ID3D12Resource *resource, un assert_that(hr == S_OK, "Failed to map readback buffer, hr %#x.\n", hr); } +static void get_resource_readback_with_command_list(ID3D12Resource *resource, unsigned int sub_resource, + struct d3d12_resource_readback *rb, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) +{ + return get_resource_readback_with_command_list_and_states(resource, sub_resource, rb, queue, command_list, + RESOURCE_STATE_DO_NOT_CHANGE, RESOURCE_STATE_DO_NOT_CHANGE); +} + static unsigned int get_readback_uint(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) { diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 8453617e..79d637e6 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -546,13 +546,9 @@ static struct resource_readback *d3d12_runner_get_resource_readback(struct shade else state = D3D12_RESOURCE_STATE_UNORDERED_ACCESS; - transition_resource_state(test_context->list, resource->resource, - state, D3D12_RESOURCE_STATE_COPY_SOURCE); - get_resource_readback_with_command_list(resource->resource, 0, rb, - test_context->queue, test_context->list); + get_resource_readback_with_command_list_and_states(resource->resource, 0, rb, + test_context->queue, test_context->list, state, state); reset_command_list(test_context->list, test_context->allocator); - transition_resource_state(test_context->list, resource->resource, - D3D12_RESOURCE_STATE_COPY_SOURCE, state); return &rb->rb; }

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement the DXIL EXTRACTVAL instruction.
by Alexandre Julliard 01 Nov '23

01 Nov '23

Module: vkd3d Branch: master Commit: 589670180a1a8e9221afd8923b61775264ccfb5e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/589670180a1a8e9221afd8923b617… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Oct 11 14:33:27 2023 +1000 vkd3d-shader/dxil: Implement the DXIL EXTRACTVAL instruction. --- libs/vkd3d-shader/dxil.c | 92 +++++++++++++++++++++++++++++ tests/hlsl/asfloat.shader_test | 2 +- tests/hlsl/cbuffer.shader_test | 16 ++--- tests/hlsl/expr-indexing.shader_test | 4 +- tests/hlsl/half.shader_test | 2 +- tests/hlsl/majority-pragma.shader_test | 26 ++++---- tests/hlsl/majority-syntax.shader_test | 2 +- tests/hlsl/matrix-indexing.shader_test | 8 +-- tests/hlsl/nested-arrays.shader_test | 2 +- tests/hlsl/object-field-offsets.shader_test | 4 +- tests/hlsl/storage-qualifiers.shader_test | 2 +- tests/hlsl/struct-array.shader_test | 2 +- tests/hlsl/swizzle-matrix.shader_test | 14 ++--- tests/hlsl/swizzles.shader_test | 6 +- tests/hlsl/uniform-semantics.shader_test | 4 +- tests/hlsl/vector-indexing.shader_test | 2 +- 16 files changed, 140 insertions(+), 48 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/spirv: Support scalar swizzle of vector SSA registers.
by Alexandre Julliard 01 Nov '23

01 Nov '23

Module: vkd3d Branch: master Commit: e899b67bbf155030e454815e5ffeb11100f8a143 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e899b67bbf155030e454815e5ffeb… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Oct 6 00:35:28 2023 +1000 vkd3d-shader/spirv: Support scalar swizzle of vector SSA registers. --- libs/vkd3d-shader/spirv.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 343be44f..6faac0cc 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3543,6 +3543,14 @@ static bool vkd3d_swizzle_is_equal(unsigned int dst_write_mask, return vkd3d_compact_swizzle(VKD3D_SHADER_NO_SWIZZLE, dst_write_mask) == vkd3d_compact_swizzle(swizzle, write_mask); } +static bool vkd3d_swizzle_is_scalar(unsigned int swizzle) +{ + unsigned int component_idx = vkd3d_swizzle_get_component(swizzle, 0); + return vkd3d_swizzle_get_component(swizzle, 1) == component_idx + && vkd3d_swizzle_get_component(swizzle, 2) == component_idx + && vkd3d_swizzle_get_component(swizzle, 3) == component_idx; +} + static uint32_t spirv_compiler_emit_swizzle(struct spirv_compiler *compiler, uint32_t val_id, unsigned int val_write_mask, enum vkd3d_shader_component_type component_type, unsigned int swizzle, unsigned int write_mask) @@ -3745,6 +3753,26 @@ static void spirv_compiler_set_ssa_register_id(const struct spirv_compiler *comp compiler->ssa_register_ids[i] = val_id; } +static uint32_t spirv_compiler_emit_load_ssa_reg(struct spirv_compiler *compiler, + const struct vkd3d_shader_register *reg, enum vkd3d_shader_component_type component_type, + unsigned int swizzle) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + unsigned int component_idx; + uint32_t type_id, val_id; + + val_id = spirv_compiler_get_ssa_register_id(compiler, reg); + assert(val_id); + assert(vkd3d_swizzle_is_scalar(swizzle)); + + if (reg->dimension == VSIR_DIMENSION_SCALAR) + return val_id; + + type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); + component_idx = vkd3d_swizzle_get_component(swizzle, 0); + return vkd3d_spirv_build_op_composite_extract1(builder, type_id, val_id, component_idx); +} + static uint32_t spirv_compiler_emit_load_reg(struct spirv_compiler *compiler, const struct vkd3d_shader_register *reg, DWORD swizzle, DWORD write_mask) { @@ -3766,7 +3794,7 @@ static uint32_t spirv_compiler_emit_load_reg(struct spirv_compiler *compiler, component_type = vkd3d_component_type_from_data_type(reg->data_type); if (reg->type == VKD3DSPR_SSA) - return spirv_compiler_get_ssa_register_id(compiler, reg); + return spirv_compiler_emit_load_ssa_reg(compiler, reg, component_type, swizzle); if (!spirv_compiler_get_register_info(compiler, reg, &reg_info)) {

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX instruction CBufferLoadLegacy.
by Alexandre Julliard 01 Nov '23

01 Nov '23

Module: vkd3d Branch: master Commit: 43b5d738709c02d5a30f2ba60af20ec15b2588a0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/43b5d738709c02d5a30f2ba60af20… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Oct 5 15:38:09 2023 +1000 vkd3d-shader/dxil: Implement DX instruction CBufferLoadLegacy. --- libs/vkd3d-shader/dxil.c | 84 ++++++++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 6 +++ 2 files changed, 87 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 352e4b58..aa16498f 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -247,6 +247,7 @@ enum dx_intrinsic_opcode DX_LOAD_INPUT = 4, DX_STORE_OUTPUT = 5, DX_CREATE_HANDLE = 57, + DX_CBUFFER_LOAD_LEGACY = 59, }; struct sm6_pointer_info @@ -1586,6 +1587,11 @@ static const struct sm6_type *sm6_type_get_scalar_type(const struct sm6_type *ty } } +static unsigned int sm6_type_max_vector_size(const struct sm6_type *type) +{ + return min((VKD3D_VEC4_SIZE * sizeof(uint32_t) * CHAR_BIT) / type->u.width, VKD3D_VEC4_SIZE); +} + static const struct sm6_type *sm6_parser_get_type(struct sm6_parser *sm6, uint64_t type_id) { if (type_id >= sm6->type_count) @@ -1690,7 +1696,7 @@ static const char *sm6_parser_get_global_symbol_name(const struct sm6_parser *sm static unsigned int register_get_uint_value(const struct vkd3d_shader_register *reg) { - if (!register_is_constant(reg) || !data_type_is_integer(reg->data_type)) + if (!register_is_constant(reg) || (!data_type_is_integer(reg->data_type) && !data_type_is_bool(reg->data_type))) return UINT_MAX; if (reg->dimension == VSIR_DIMENSION_VEC4) @@ -1847,8 +1853,8 @@ static enum vkd3d_data_type vkd3d_data_type_from_sm6_type(const struct sm6_type return VKD3D_DATA_UINT; } -static void register_init_ssa_scalar(struct vkd3d_shader_register *reg, const struct sm6_type *type, - struct sm6_parser *sm6) +static void register_init_ssa_vector(struct vkd3d_shader_register *reg, const struct sm6_type *type, + unsigned int component_count, struct sm6_parser *sm6) { enum vkd3d_data_type data_type; unsigned int id; @@ -1856,6 +1862,13 @@ static void register_init_ssa_scalar(struct vkd3d_shader_register *reg, const st id = sm6_parser_alloc_ssa_id(sm6); data_type = vkd3d_data_type_from_sm6_type(sm6_type_get_scalar_type(type, 0)); register_init_with_id(reg, VKD3DSPR_SSA, data_type, id); + reg->dimension = component_count > 1 ? VSIR_DIMENSION_VEC4 : VSIR_DIMENSION_SCALAR; +} + +static void register_init_ssa_scalar(struct vkd3d_shader_register *reg, const struct sm6_type *type, + struct sm6_parser *sm6) +{ + register_init_ssa_vector(reg, type, 1, sm6); } static void dst_param_init(struct vkd3d_shader_dst_param *param) @@ -1872,6 +1885,13 @@ static inline void dst_param_init_scalar(struct vkd3d_shader_dst_param *param, u param->shift = 0; } +static void dst_param_init_vector(struct vkd3d_shader_dst_param *param, unsigned int component_count) +{ + param->write_mask = (1u << component_count) - 1; + param->modifiers = 0; + param->shift = 0; +} + static void dst_param_init_ssa_scalar(struct vkd3d_shader_dst_param *param, const struct sm6_type *type, struct sm6_parser *sm6) { @@ -1897,6 +1917,14 @@ static void src_param_init_from_value(struct vkd3d_shader_src_param *param, cons param->reg = src->u.reg; } +static void src_param_init_vector_from_reg(struct vkd3d_shader_src_param *param, + const struct vkd3d_shader_register *reg) +{ + param->swizzle = VKD3D_SHADER_NO_SWIZZLE; + param->modifiers = VKD3DSPSM_NONE; + param->reg = *reg; +} + static void register_index_address_init(struct vkd3d_shader_register_index *idx, const struct sm6_value *address, struct sm6_parser *sm6) { @@ -1928,6 +1956,17 @@ static void instruction_dst_param_init_ssa_scalar(struct vkd3d_shader_instructio dst->u.reg = param->reg; } +static void instruction_dst_param_init_ssa_vector(struct vkd3d_shader_instruction *ins, + unsigned int component_count, struct sm6_parser *sm6) +{ + struct vkd3d_shader_dst_param *param = instruction_dst_params_alloc(ins, 1, sm6); + struct sm6_value *dst = sm6_parser_get_current_value(sm6); + + dst_param_init_vector(param, component_count); + register_init_ssa_vector(&param->reg, sm6_type_get_scalar_type(dst->type, 0), component_count, sm6); + dst->u.reg = param->reg; +} + /* Recurse through the block tree while maintaining a current value count. The current * count is the sum of the global count plus all declarations within the current function. * Store into value_capacity the highest count seen. */ @@ -1992,6 +2031,18 @@ static size_t sm6_parser_get_value_index(struct sm6_parser *sm6, uint64_t idx) return i; } +static bool sm6_value_validate_is_handle(const struct sm6_value *value, struct sm6_parser *sm6) +{ + if (!sm6_value_is_handle(value)) + { + WARN("Handle parameter of type %u is not a handle.\n", value->value_type); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCE_HANDLE, + "A handle parameter passed to a DX intrinsic function is not a handle."); + return false; + } + return true; +} + static const struct sm6_value *sm6_parser_get_value_safe(struct sm6_parser *sm6, unsigned int idx) { if (idx < sm6->value_count) @@ -2554,6 +2605,32 @@ static struct sm6_block *sm6_block_create() return block; } +static void sm6_parser_emit_dx_cbuffer_load(struct sm6_parser *sm6, struct sm6_block *code_block, + enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct vkd3d_shader_instruction *ins) +{ + struct sm6_value *dst = sm6_parser_get_current_value(sm6); + struct vkd3d_shader_src_param *src_param; + const struct sm6_value *buffer; + const struct sm6_type *type; + + buffer = operands[0]; + if (!sm6_value_validate_is_handle(buffer, sm6)) + return; + + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV); + + src_param = instruction_src_params_alloc(ins, 1, sm6); + src_param_init_vector_from_reg(src_param, &buffer->u.handle.reg); + register_index_address_init(&src_param->reg.idx[2], operands[1], sm6); + assert(src_param->reg.idx_count == 3); + + type = sm6_type_get_scalar_type(dst->type, 0); + assert(type); + src_param->reg.data_type = vkd3d_data_type_from_sm6_type(type); + + instruction_dst_param_init_ssa_vector(ins, sm6_type_max_vector_size(type), sm6); +} + static const struct sm6_descriptor_info *sm6_parser_get_descriptor(struct sm6_parser *sm6, enum vkd3d_shader_descriptor_type type, unsigned int id, const struct sm6_value *address) { @@ -2718,6 +2795,7 @@ struct sm6_dx_opcode_info */ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = { + [DX_CBUFFER_LOAD_LEGACY ] = {'o', "Hi", sm6_parser_emit_dx_cbuffer_load}, [DX_CREATE_HANDLE ] = {'H', "ccib", sm6_parser_emit_dx_create_handle}, [DX_LOAD_INPUT ] = {'o', "ii8i", sm6_parser_emit_dx_load_input}, [DX_STORE_OUTPUT ] = {'v', "ii8o", sm6_parser_emit_dx_store_output}, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 95065e62..f6421cc8 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -182,6 +182,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_DXIL_INVALID_SIGNATURE = 8016, VKD3D_SHADER_ERROR_DXIL_INVALID_PROPERTIES = 8017, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES = 8018, + VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCE_HANDLE = 8019, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_MAGIC_NUMBER = 8300, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_SHADER_TYPE = 8301, @@ -584,6 +585,11 @@ static inline bool data_type_is_integer(enum vkd3d_data_type data_type) || data_type == VKD3D_DATA_UINT64; } +static inline bool data_type_is_bool(enum vkd3d_data_type data_type) +{ + return data_type == VKD3D_DATA_BOOL; +} + enum vsir_dimension { VSIR_DIMENSION_NONE,

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX instruction CreateHandle.
by Alexandre Julliard 01 Nov '23

01 Nov '23

Module: vkd3d Branch: master Commit: 3b1bbe2b0aa82fc1fe0db823176ba4d1e1bc88d5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3b1bbe2b0aa82fc1fe0db823176ba… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Oct 16 11:47:11 2023 +1000 vkd3d-shader/dxil: Implement DX instruction CreateHandle. --- libs/vkd3d-shader/dxil.c | 153 ++++++++++++++++++++++++++++--- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 140 insertions(+), 14 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/dxil: Replace register_address_init() with register_index_address_init().
by Alexandre Julliard 01 Nov '23

01 Nov '23

Module: vkd3d Branch: master Commit: f57d65361ab0bca2f6caa7e472626828313fdd02 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f57d65361ab0bca2f6caa7e472626… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Oct 16 11:18:30 2023 +1000 vkd3d-shader/dxil: Replace register_address_init() with register_index_address_init(). Makes it much clearer which register index is being written. --- libs/vkd3d-shader/dxil.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 19ce2936..30d3dff0 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -1861,25 +1861,24 @@ static void src_param_init_from_value(struct vkd3d_shader_src_param *param, cons param->reg = src->u.reg; } -static void register_address_init(struct vkd3d_shader_register *reg, const struct sm6_value *address, - unsigned int idx, struct sm6_parser *sm6) +static void register_index_address_init(struct vkd3d_shader_register_index *idx, const struct sm6_value *address, + struct sm6_parser *sm6) { - assert(idx < ARRAY_SIZE(reg->idx)); if (sm6_value_is_constant(address)) { - reg->idx[idx].offset = sm6_value_get_constant_uint(address); + idx->offset = sm6_value_get_constant_uint(address); } else if (sm6_value_is_undef(address)) { - reg->idx[idx].offset = 0; + idx->offset = 0; } else { struct vkd3d_shader_src_param *rel_addr = shader_parser_get_src_params(&sm6->p, 1); if (rel_addr) src_param_init_from_value(rel_addr, address); - reg->idx[idx].offset = 0; - reg->idx[idx].rel_addr = rel_addr; + idx->offset = 0; + idx->rel_addr = rel_addr; } } @@ -2546,7 +2545,7 @@ static void sm6_parser_emit_dx_load_input(struct sm6_parser *sm6, struct sm6_blo src_param->reg = sm6->input_params[row_index].reg; src_param_init_scalar(src_param, column_index); if (e->register_count > 1) - register_address_init(&src_param->reg, operands[1], 0, sm6); + register_index_address_init(&src_param->reg.idx[0], operands[1], sm6); instruction_dst_param_init_ssa_scalar(ins, sm6); } @@ -2598,7 +2597,7 @@ static void sm6_parser_emit_dx_store_output(struct sm6_parser *sm6, struct sm6_b dst_param_init_scalar(dst_param, column_index); dst_param->reg = sm6->output_params[row_index].reg; if (e->register_count > 1) - register_address_init(&dst_param->reg, operands[1], 0, sm6); + register_index_address_init(&dst_param->reg.idx[0], operands[1], sm6); if ((src_param = instruction_src_params_alloc(ins, 1, sm6))) src_param_init_from_value(src_param, value);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2023