September 2023 - Wine-commits

Giovanni Mascellani : tests: Compile HLSL shaders at runtime in test_unknown_dsv_format().
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: vkd3d Branch: master Commit: 61b403a0325d3dc2b6d9c6c38c340a44b2111ddd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/61b403a0325d3dc2b6d9c6c38c340… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Sep 9 23:00:34 2023 +0200 tests: Compile HLSL shaders at runtime in test_unknown_dsv_format(). --- tests/d3d12.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 804b85bd..0748ab6d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5700,40 +5700,37 @@ static void test_unknown_dsv_format(void) D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; ID3D12GraphicsCommandList *command_list; struct depth_stencil_resource ds; + D3D12_SHADER_BYTECODE ps_color; D3D12_CLEAR_VALUE clear_value; struct test_context_desc desc; struct test_context context; ID3D12CommandQueue *queue; + ID3D10Blob *bytecode; HRESULT hr; - static const DWORD ps_color_code[] = - { -#if 0 - float4 color; + static const char ps_color_code[] = + "float4 color;\n" + "\n" + "float4 main(float4 position : SV_POSITION) : SV_Target\n" + "{\n" + " return color;\n" + "}\n"; - float4 main(float4 position : SV_POSITION) : SV_Target - { - return color; - } -#endif - 0x43425844, 0xd18ead43, 0x8b8264c1, 0x9c0a062d, 0xfc843226, 0x00000001, 0x000000e0, 0x00000003, - 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, - 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, - 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, - 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000044, 0x00000050, - 0x00000011, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, - 0x00000000, 0x06000036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, - }; - static const D3D12_SHADER_BYTECODE ps_color = {ps_color_code, sizeof(ps_color_code)}; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + bytecode = compile_shader(ps_color_code, sizeof(ps_color_code) - 1, "ps_4_0"); + ps_color = shader_bytecode_from_blob(bytecode); + memset(&desc, 0, sizeof(desc)); desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT; desc.no_root_signature = true; if (!init_test_context(&context, &desc)) + { + ID3D10Blob_Release(bytecode); return; + } command_list = context.list; queue = context.queue; @@ -5895,6 +5892,8 @@ static void test_unknown_dsv_format(void) destroy_depth_stencil(&ds); destroy_test_context(&context); + + ID3D10Blob_Release(bytecode); } static void test_append_aligned_element(void)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Produce 2D resource declarations and loads for tex1D().
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: vkd3d Branch: master Commit: 177ea3bcbde9bbe6456c8fd2a872fc5ee6884b1b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/177ea3bcbde9bbe6456c8fd2a872f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 11 12:23:04 2023 +0200 vkd3d-shader/hlsl: Produce 2D resource declarations and loads for tex1D(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 37 +++++++++++++++++++++++++++++++- tests/hlsl/combined-samplers.shader_test | 6 +++--- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 67fd9f6f..fb6d485e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3457,7 +3457,42 @@ static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer * if (!(coords = add_implicit_conversion(ctx, params->instrs, params->args[1], hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, hlsl_sampler_dim_count(dim)), loc))) - coords = params->args[1]; + { + return false; + } + + /* tex1D() functions never produce 1D resource declarations. For newer profiles half offset + is used for the second coordinate, while older ones appear to replicate first coordinate.*/ + if (dim == HLSL_SAMPLER_DIM_1D) + { + struct hlsl_ir_load *load; + struct hlsl_ir_node *half; + struct hlsl_ir_var *var; + unsigned int idx = 0; + + if (!(var = hlsl_new_synthetic_var(ctx, "coords", hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, 2), loc))) + return false; + + initialize_var_components(ctx, params->instrs, var, &idx, coords); + if (shader_profile_version_ge(ctx, 4, 0)) + { + if (!(half = hlsl_new_float_constant(ctx, 0.5f, loc))) + return false; + hlsl_block_add_instr(params->instrs, half); + + initialize_var_components(ctx, params->instrs, var, &idx, half); + } + else + initialize_var_components(ctx, params->instrs, var, &idx, coords); + + if (!(load = hlsl_new_var_load(ctx, var, loc))) + return false; + hlsl_block_add_instr(params->instrs, &load->node); + + coords = &load->node; + + dim = HLSL_SAMPLER_DIM_2D; + } load_params.coords = coords; load_params.resource = params->args[0]; diff --git a/tests/hlsl/combined-samplers.shader_test b/tests/hlsl/combined-samplers.shader_test index 57644c26..465c11cb 100644 --- a/tests/hlsl/combined-samplers.shader_test +++ b/tests/hlsl/combined-samplers.shader_test @@ -121,7 +121,7 @@ float4 main() : sv_target } -[pixel shader todo] +[pixel shader] sampler sam[2]; float4 main() : sv_target @@ -130,8 +130,8 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (1, 1, 1, 11) +draw quad +probe all rgba (1, 1, 1, 11) [require]

1 0

Nikolay Sivov : vkd3d-shader/d3dbc: Disallow 1D sampler types when writing sampler declaration.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: vkd3d Branch: master Commit: ee6c66eb1bc59cab24bdc060a0e38d9972dfabb1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ee6c66eb1bc59cab24bdc060a0e38… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 11 12:34:25 2023 +0200 vkd3d-shader/d3dbc: Disallow 1D sampler types when writing sampler declaration. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/d3dbc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 2b02d51f..d5104ae9 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1982,10 +1982,6 @@ static void write_sm1_sampler_dcl(struct hlsl_ctx *ctx, struct vkd3d_bytecode_bu switch (sampler_dim) { - case HLSL_SAMPLER_DIM_1D: - res_type = VKD3D_SM1_RESOURCE_TEXTURE_1D; - break; - case HLSL_SAMPLER_DIM_2D: res_type = VKD3D_SM1_RESOURCE_TEXTURE_2D; break;

1 0

Zebediah Figura : tests: Check the result of vkCreateGraphicsPipelines().
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: vkd3d Branch: master Commit: e847df95288ef04c85e4442d10d3ee5dd871c980 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e847df95288ef04c85e4442d10d3e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 1 18:30:06 2023 -0500 tests: Check the result of vkCreateGraphicsPipelines(). --- tests/shader_runner_vulkan.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index a8e59eef..60c473a4 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -612,6 +612,7 @@ static VkPipeline create_graphics_pipeline(const struct vulkan_shader_runner *ru VkDevice device = runner->device; VkPipeline pipeline; unsigned int i, j; + VkResult vr; int ret; memset(stage_desc, 0, sizeof(stage_desc)); @@ -714,7 +715,8 @@ static VkPipeline create_graphics_pipeline(const struct vulkan_shader_runner *ru pipeline_desc.renderPass = render_pass; pipeline_desc.subpass = 0; - VK_CALL(vkCreateGraphicsPipelines(runner->device, VK_NULL_HANDLE, 1, &pipeline_desc, NULL, &pipeline)); + vr = VK_CALL(vkCreateGraphicsPipelines(runner->device, VK_NULL_HANDLE, 1, &pipeline_desc, NULL, &pipeline)); + ok(vr == VK_SUCCESS, "Failed to create graphics pipeline, vr %d.\n", vr); VK_CALL(vkDestroyShaderModule(device, stage_desc[0].module, NULL)); VK_CALL(vkDestroyShaderModule(device, stage_desc[1].module, NULL));

1 0

Martin Storsjö : include: Add the ID3D12PipelineLibrary{,1} interfaces.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: vkd3d Branch: master Commit: fffdb76b3311353adfcece9d06aceace46117af3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fffdb76b3311353adfcece9d06ace… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Sep 5 23:42:37 2023 +0300 include: Add the ID3D12PipelineLibrary{,1} interfaces. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/vkd3d_d3d12.idl | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 846cd245..66d7ace1 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -3080,6 +3080,42 @@ interface ID3D12Device : ID3D12Object LUID GetAdapterLuid(); } +[ + uuid(c64226a8-9201-46af-b4cc-53fb9ff7414f), + object, + local, + pointer_default(unique) +] +interface ID3D12PipelineLibrary : ID3D12DeviceChild +{ + HRESULT StorePipeline(const WCHAR *name, ID3D12PipelineState *pipeline); + + HRESULT LoadGraphicsPipeline(const WCHAR *name, + const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc, REFIID riid, + void **pipeline_state); + + HRESULT LoadComputePipeline(const WCHAR *name, + const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, REFIID riid, + void **pipeline_state); + + SIZE_T GetSerializedSize(); + + HRESULT Serialize(void *data, SIZE_T data_size_in_bytes); +} + +[ + uuid(80eabf42-2568-4e5e-bd82-c37f86961dc3), + object, + local, + pointer_default(unique) +] +interface ID3D12PipelineLibrary1 : ID3D12PipelineLibrary +{ + HRESULT LoadPipeline(const WCHAR *name, + const D3D12_PIPELINE_STATE_STREAM_DESC *desc, REFIID riid, + void **pipeline_state); +} + [ uuid(77acce80-638e-4e65-8895-c1f23386863e), object,

1 0

Martin Storsjö : include: Add the ID3D12Device4 interface.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: vkd3d Branch: master Commit: b005390a362a51aba2e67ab460b5f8da13c9a36c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b005390a362a51aba2e67ab460b5f… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Sep 5 23:45:20 2023 +0300 include: Add the ID3D12Device4 interface. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/vkd3d_d3d12.idl | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 66d7ace1..cd4cac24 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -692,6 +692,13 @@ typedef struct D3D12_RESOURCE_ALLOCATION_INFO UINT64 Alignment; } D3D12_RESOURCE_ALLOCATION_INFO; +typedef struct D3D12_RESOURCE_ALLOCATION_INFO1 +{ + UINT64 Offset; + UINT64 Alignment; + UINT64 SizeInBytes; +} D3D12_RESOURCE_ALLOCATION_INFO1; + typedef struct D3D12_DRAW_ARGUMENTS { UINT VertexCountPerInstance; @@ -3198,6 +3205,58 @@ interface ID3D12VersionedRootSignatureDeserializer : IUnknown const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *GetUnconvertedRootSignatureDesc(); }; +typedef enum D3D12_COMMAND_LIST_FLAGS +{ + D3D12_COMMAND_LIST_FLAG_NONE = 0x0, +} D3D12_COMMAND_LIST_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_COMMAND_LIST_FLAGS);") + +[ + uuid(e865df17-a9ee-46f9-a463-3098315aa2e5), + object, + local, + pointer_default(unique) +] +interface ID3D12Device4 : ID3D12Device3 +{ + HRESULT CreateCommandList1( + UINT node_mask, D3D12_COMMAND_LIST_TYPE type, + D3D12_COMMAND_LIST_FLAGS flags, REFIID riid, + void **command_list); + + HRESULT CreateProtectedResourceSession( + const D3D12_PROTECTED_RESOURCE_SESSION_DESC *desc, REFIID riid, + void **session); + + HRESULT CreateCommittedResource1( + const D3D12_HEAP_PROPERTIES *heap_properties, + D3D12_HEAP_FLAGS heap_flags, + const D3D12_RESOURCE_DESC *desc, + D3D12_RESOURCE_STATES initial_resource_state, + const D3D12_CLEAR_VALUE *optimized_clear_value, + ID3D12ProtectedResourceSession *protected_session, + REFIID riid_resource, + void **resource); + + HRESULT CreateHeap1( + const D3D12_HEAP_DESC *desc, + ID3D12ProtectedResourceSession *protected_session, + REFIID riid, void **heap); + + HRESULT CreateReservedResource1( + const D3D12_RESOURCE_DESC *desc, + D3D12_RESOURCE_STATES initial_state, + const D3D12_CLEAR_VALUE *optimized_clear_value, + ID3D12ProtectedResourceSession *protected_session, + REFIID riid, void **resource); + + D3D12_RESOURCE_ALLOCATION_INFO GetResourceAllocationInfo1( + UINT visible_mask, + UINT resource_descs_count, + const D3D12_RESOURCE_DESC *resource_descs, + D3D12_RESOURCE_ALLOCATION_INFO1 *resource_allocation_info1); +} + typedef HRESULT (__stdcall *PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER)( const void *data, SIZE_T data_size, REFIID iid, void **deserializer);

1 0

Martin Storsjö : include: Add the ID3D12LifetimeOwner interface.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: vkd3d Branch: master Commit: 06388a2c9bd3d8da9e6d90633afc60fd50c881c5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/06388a2c9bd3d8da9e6d90633afc6… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Sep 5 23:51:50 2023 +0300 include: Add the ID3D12LifetimeOwner interface. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/vkd3d_d3d12.idl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index cd4cac24..fc66e02b 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -3257,6 +3257,23 @@ interface ID3D12Device4 : ID3D12Device3 D3D12_RESOURCE_ALLOCATION_INFO1 *resource_allocation_info1); } +typedef enum D3D12_LIFETIME_STATE +{ + D3D12_LIFETIME_STATE_IN_USE = 0x0, + D3D12_LIFETIME_STATE_NOT_IN_USE = 0x1, +} D3D12_LIFETIME_STATE; + +[ + uuid(e667af9f-cd56-4f46-83ce-032e595d70a8), + object, + local, + pointer_default(unique) +] +interface ID3D12LifetimeOwner : IUnknown +{ + void LifetimeStateUpdated(D3D12_LIFETIME_STATE NewState); +} + typedef HRESULT (__stdcall *PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER)( const void *data, SIZE_T data_size, REFIID iid, void **deserializer);

1 0

Martin Storsjö : include: Add the ID3D12SwapChainAssistant interface.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: vkd3d Branch: master Commit: 8076c9a591c5c29e1b28e73d5c34d9a4f6df9f27 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8076c9a591c5c29e1b28e73d5c34d… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Sep 5 23:54:01 2023 +0300 include: Add the ID3D12SwapChainAssistant interface. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/vkd3d_d3d12.idl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index fc66e02b..ecfd6656 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -3274,6 +3274,22 @@ interface ID3D12LifetimeOwner : IUnknown void LifetimeStateUpdated(D3D12_LIFETIME_STATE NewState); } +[ + uuid(f1df64b6-57fd-49cd-8807-c0eb88b45c8f), + object, + local, + pointer_default(unique) +] +interface ID3D12SwapChainAssistant : IUnknown +{ + LUID GetLUID(); + HRESULT GetSwapChainObject(REFIID riid, void **ppv); + HRESULT GetCurrentResourceAndCommandQueue( + REFIID riid_resource, void **resource, + REFIID riid_queue, void **queue); + HRESULT InsertImplicitSync(); +} + typedef HRESULT (__stdcall *PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER)( const void *data, SIZE_T data_size, REFIID iid, void **deserializer);

1 0

Martin Storsjö : include: Add the ID3D12LifetimeTracker interface.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: vkd3d Branch: master Commit: 02fc1ba9c36ff8626184869b130a0d22aabab465 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/02fc1ba9c36ff8626184869b130a0… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Sep 5 23:55:18 2023 +0300 include: Add the ID3D12LifetimeTracker interface. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/vkd3d_d3d12.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index ecfd6656..cdb75c1f 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -3290,6 +3290,17 @@ interface ID3D12SwapChainAssistant : IUnknown HRESULT InsertImplicitSync(); } +[ + uuid(3fd03d36-4eb1-424a-a582-494ecb8ba813), + object, + local, + pointer_default(unique) +] +interface ID3D12LifetimeTracker : ID3D12DeviceChild +{ + HRESULT DestroyOwnedObject(ID3D12DeviceChild *object); +} + typedef HRESULT (__stdcall *PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER)( const void *data, SIZE_T data_size, REFIID iid, void **deserializer);

1 0

Martin Storsjö : include: Add the ID3D12StateObject interface.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: vkd3d Branch: master Commit: 8e3f86334179fc92daf3d8c3dbf861e39eb73515 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8e3f86334179fc92daf3d8c3dbf86… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Sep 5 23:57:15 2023 +0300 include: Add the ID3D12StateObject interface. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/vkd3d_d3d12.idl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index cdb75c1f..9545b663 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -3301,6 +3301,16 @@ interface ID3D12LifetimeTracker : ID3D12DeviceChild HRESULT DestroyOwnedObject(ID3D12DeviceChild *object); } +[ + uuid(47016943-fca8-4594-93ea-af258b55346d), + object, + local, + pointer_default(unique) +] +interface ID3D12StateObject : ID3D12Pageable +{ +} + typedef HRESULT (__stdcall *PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER)( const void *data, SIZE_T data_size, REFIID iid, void **deserializer);

1 0