September 2023 - Wine-Commits

Martin Storsjö : include: Add the ID3D12Device6 interface.
by Alexandre Julliard Sept. 13, 2023

Sept. 13, 2023

Module: vkd3d Branch: master Commit: aad1c3e35cbfe716c1f6d638f51ce493ba795ec2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/aad1c3e35cbfe716c1f6d638f51ce… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Sep 6 18:05:38 2023 +0300 include: Add the ID3D12Device6 interface. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/vkd3d_d3d12.idl | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 563eae26..79a357bf 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -3995,6 +3995,37 @@ interface ID3D12DeviceRemovedExtendedData2 : ID3D12DeviceRemovedExtendedData1 D3D12_DRED_DEVICE_STATE GetDeviceState(); } +typedef enum D3D12_BACKGROUND_PROCESSING_MODE +{ + D3D12_BACKGROUND_PROCESSING_MODE_ALLOWED = 0x0, + D3D12_BACKGROUND_PROCESSING_MODE_ALLOW_INTRUSIVE_MEASUREMENTS = 0x1, + D3D12_BACKGROUND_PROCESSING_MODE_DISABLE_BACKGROUND_WORK = 0x2, + D3D12_BACKGROUND_PROCESSING_MODE_DISABLE_PROFILING_BY_SYSTEM = 0x3, +} D3D12_BACKGROUND_PROCESSING_MODE; + +typedef enum D3D12_MEASUREMENTS_ACTION +{ + D3D12_MEASUREMENTS_ACTION_KEEP_ALL = 0x0, + D3D12_MEASUREMENTS_ACTION_COMMIT_RESULTS = 0x1, + D3D12_MEASUREMENTS_ACTION_COMMIT_RESULTS_HIGH_PRIORITY = 0x2, + D3D12_MEASUREMENTS_ACTION_DISCARD_PREVIOUS = 0x3, +} D3D12_MEASUREMENTS_ACTION; + +[ + uuid(c70b221b-40e4-4a17-89af-025a0727a6dc), + object, + local, + pointer_default(unique) +] +interface ID3D12Device6 : ID3D12Device5 +{ + HRESULT SetBackgroundProcessingMode( + D3D12_BACKGROUND_PROCESSING_MODE mode, + D3D12_MEASUREMENTS_ACTION action, + HANDLE event, + BOOL *further_measurements_desired); +} + 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 ID3D12Device5 interface.
by Alexandre Julliard Sept. 13, 2023

Sept. 13, 2023

Module: vkd3d Branch: master Commit: 1302b897ed73ff3c9f6321c9213c57cc3f251c05 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1302b897ed73ff3c9f6321c9213c5… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Sep 6 00:09:29 2023 +0300 include: Add the ID3D12Device5 interface. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/vkd3d_d3d12.idl | 366 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 366 insertions(+)

1 0

Martin Storsjö : include: Add the ID3D12StateObjectProperties interface.
by Alexandre Julliard Sept. 13, 2023

Sept. 13, 2023

Module: vkd3d Branch: master Commit: 16daf0423da459010d8b8bed645979f4483d7924 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/16daf0423da459010d8b8bed64597… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Sep 5 23:58:12 2023 +0300 include: Add the ID3D12StateObjectProperties interface. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/vkd3d_d3d12.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 9545b663..ec74d167 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -3311,6 +3311,20 @@ interface ID3D12StateObject : ID3D12Pageable { } +[ + uuid(de5fa827-9bf9-4f26-89ff-d7f56fde3860), + object, + local, + pointer_default(unique) +] +interface ID3D12StateObjectProperties : IUnknown +{ + void *GetShaderIdentifier(const WCHAR *export_name); + UINT64 GetShaderStackSize(const WCHAR *export_name); + UINT64 GetPipelineStackSize(); + void SetPipelineStackSize(UINT64 pipeline_stack_size_in_bytes); +} + 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 Sept. 13, 2023

Sept. 13, 2023

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

Martin Storsjö : include: Add the ID3D12Device4 interface.
by Alexandre Julliard Sept. 13, 2023

Sept. 13, 2023

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 ID3D12SwapChainAssistant interface.
by Alexandre Julliard Sept. 13, 2023

Sept. 13, 2023

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 ID3D12PipelineLibrary{,1} interfaces.
by Alexandre Julliard Sept. 13, 2023

Sept. 13, 2023

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 ID3D12LifetimeOwner interface.
by Alexandre Julliard Sept. 13, 2023

Sept. 13, 2023

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 ID3D12LifetimeTracker interface.
by Alexandre Julliard Sept. 13, 2023

Sept. 13, 2023

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

Zebediah Figura : tests: Check the result of vkCreateGraphicsPipelines().
by Alexandre Julliard Sept. 13, 2023

Sept. 13, 2023

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