wine-commits October 2023

wine-commits@winehq.org

1 participants
702 discussions

Rémi Bernon : dmime/tests: Queue the message before calling SendPMsg twice.
by Alexandre Julliard 10 Oct '23

10 Oct '23

Module: wine Branch: master Commit: d0c3a0e03d557498195a70693003deae5b3e4588 URL: https://gitlab.winehq.org/wine/wine/-/commit/d0c3a0e03d557498195a70693003de… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 3 15:13:28 2023 +0200 dmime/tests: Queue the message before calling SendPMsg twice. --- dlls/dmime/tests/dmime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index cb35ef64ead..e390f86f1bf 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -2849,7 +2849,7 @@ static void test_performance_pmsg(void) ok(clone != NULL, "got %p\n", clone); msg->mtTime = 500; - msg->dwFlags = DMUS_PMSGF_MUSICTIME; + msg->dwFlags = DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_QUEUE; hr = IDirectMusicPerformance_SendPMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicPerformance_SendPMsg(performance, msg);

1 0

Paul Gofman : ntdll: Implement NtQueryValueKey(KeyValuePartialInformationAlign64).
by Alexandre Julliard 10 Oct '23

10 Oct '23

Module: wine Branch: master Commit: b15680a05e6557413b81c0827f7455ace6903cb2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b15680a05e6557413b81c0827f7455… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Oct 5 18:21:13 2023 -0600 ntdll: Implement NtQueryValueKey(KeyValuePartialInformationAlign64). --- dlls/ntdll/tests/reg.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/registry.c | 15 +++++++++++++++ include/winternl.h | 6 ++++++ 3 files changed, 58 insertions(+) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 978d50dbd0d..0d1ffbb4ff6 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -768,6 +768,7 @@ static void test_NtQueryValueKey(void) UNICODE_STRING ValName; KEY_VALUE_BASIC_INFORMATION *basic_info; KEY_VALUE_PARTIAL_INFORMATION *partial_info, pi; + KEY_VALUE_PARTIAL_INFORMATION_ALIGN64 *aligned_info; KEY_VALUE_FULL_INFORMATION *full_info; DWORD len, expected; @@ -815,6 +816,42 @@ static void test_NtQueryValueKey(void) ok(*(DWORD *)partial_info->Data == 711, "incorrect Data returned: 0x%lx\n", *(DWORD *)partial_info->Data); HeapFree(GetProcessHeap(), 0, partial_info); + len = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION_ALIGN64, Data[0]); + aligned_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*aligned_info) + 4); + + aligned_info = (KEY_VALUE_PARTIAL_INFORMATION_ALIGN64 *)((char *)aligned_info + 4); + status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformationAlign64, aligned_info, len, &len); + ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey should have returned STATUS_BUFFER_OVERFLOW instead of 0x%08lx\n", status); + ok(aligned_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %ld\n", aligned_info->Type); + ok(aligned_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %ld\n", aligned_info->DataLength); + ok(len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION_ALIGN64, Data[aligned_info->DataLength]), "NtQueryValueKey returned wrong len %ld\n", len); + + len = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION_ALIGN64, Data[0]); + aligned_info = (KEY_VALUE_PARTIAL_INFORMATION_ALIGN64 *)((char *)aligned_info - 4); + status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformationAlign64, aligned_info, len, &len); + ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey should have returned STATUS_BUFFER_OVERFLOW instead of 0x%08lx\n", status); + ok(aligned_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %ld\n", aligned_info->Type); + ok(aligned_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %ld\n", aligned_info->DataLength); + ok(len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION_ALIGN64, Data[aligned_info->DataLength]), "NtQueryValueKey returned wrong len %ld\n", len); + + aligned_info = HeapReAlloc(GetProcessHeap(), 0, aligned_info, len + 4); + aligned_info = (KEY_VALUE_PARTIAL_INFORMATION_ALIGN64 *)((char *)aligned_info + 4); + status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformationAlign64, aligned_info, len, &len); + ok(status == STATUS_SUCCESS, "NtQueryValueKey should have returned STATUS_SUCCESS instead of 0x%08lx\n", status); + ok(aligned_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %ld\n", aligned_info->Type); + ok(aligned_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %ld\n", aligned_info->DataLength); + ok(len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION_ALIGN64, Data[aligned_info->DataLength]), "NtQueryValueKey returned wrong len %ld\n", len); + ok(*(DWORD *)aligned_info->Data == 711, "incorrect Data returned: 0x%lx\n", *(DWORD *)aligned_info->Data); + + aligned_info = (KEY_VALUE_PARTIAL_INFORMATION_ALIGN64 *)((char *)aligned_info - 4); + status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformationAlign64, aligned_info, len, &len); + ok(status == STATUS_SUCCESS, "NtQueryValueKey should have returned STATUS_SUCCESS instead of 0x%08lx\n", status); + ok(aligned_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %ld\n", aligned_info->Type); + ok(aligned_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %ld\n", aligned_info->DataLength); + ok(len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION_ALIGN64, Data[aligned_info->DataLength]), "NtQueryValueKey returned wrong len %ld\n", len); + ok(*(DWORD *)aligned_info->Data == 711, "incorrect Data returned: 0x%lx\n", *(DWORD *)aligned_info->Data); + HeapFree(GetProcessHeap(), 0, aligned_info); + len = FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]); full_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*full_info)); status = pNtQueryValueKey(key, &ValName, KeyValueFullInformation, full_info, len, &len); diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index 3646d32c0a6..fe629b5e3b4 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -425,6 +425,16 @@ static void copy_key_value_info( KEY_VALUE_INFORMATION_CLASS info_class, void *i break; } + case KeyValuePartialInformationAlign64: + { + KEY_VALUE_PARTIAL_INFORMATION_ALIGN64 keyinfo; + keyinfo.Type = type; + keyinfo.DataLength = data_len; + length = min( length, (char *)keyinfo.Data - (char *)&keyinfo ); + memcpy( info, &keyinfo, length ); + break; + } + default: break; } @@ -519,6 +529,11 @@ NTSTATUS WINAPI NtQueryValueKey( HANDLE handle, const UNICODE_STRING *name, data_ptr = ((KEY_VALUE_PARTIAL_INFORMATION *)info)->Data; break; + case KeyValuePartialInformationAlign64: + min_size = fixed_size = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION_ALIGN64, Data); + data_ptr = ((KEY_VALUE_PARTIAL_INFORMATION_ALIGN64 *)info)->Data; + break; + default: FIXME( "Information class %d not implemented\n", info_class ); return STATUS_INVALID_PARAMETER; diff --git a/include/winternl.h b/include/winternl.h index 31785e2719e..d50bc730660 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2460,6 +2460,12 @@ typedef struct _KEY_VALUE_PARTIAL_INFORMATION { UCHAR Data[1]; } KEY_VALUE_PARTIAL_INFORMATION, *PKEY_VALUE_PARTIAL_INFORMATION; +typedef struct _KEY_VALUE_PARTIAL_INFORMATION_ALIGN64 { + ULONG Type; + ULONG DataLength; + UCHAR Data[1]; +} KEY_VALUE_PARTIAL_INFORMATION_ALIGN64, *PKEY_VALUE_PARTIAL_INFORMATION_ALIGN64; + #ifndef __OBJECT_ATTRIBUTES_DEFINED__ #define __OBJECT_ATTRIBUTES_DEFINED__ typedef struct _OBJECT_ATTRIBUTES {

1 0

Francois Gouget : nsiproxy.sys: Add a trailing linefeed to a TRACE() message.
by Alexandre Julliard 10 Oct '23

10 Oct '23

Module: wine Branch: master Commit: 9878b47bd00551fd2d2629782a5760f1d18ce7ea URL: https://gitlab.winehq.org/wine/wine/-/commit/9878b47bd00551fd2d2629782a5760… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 9 15:23:51 2023 +0200 nsiproxy.sys: Add a trailing linefeed to a TRACE() message. --- dlls/nsiproxy.sys/ip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index c904f9158fe..c5d1c596246 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -1569,7 +1569,7 @@ static NTSTATUS ipv6_forward_enumerate_all( void *key_data, UINT key_size, void BOOL want_data = key_size || rw_size || dynamic_size || static_size; struct ipv6_route_data entry; - TRACE( "%p %d %p %d %p %d %p %d %p" , key_data, key_size, rw_data, rw_size, + TRACE( "%p %d %p %d %p %d %p %d %p\n" , key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); #ifdef __linux__

1 0

Francois Gouget : dmsynth: Add a trailing linefeed to TRACE() messages.
by Alexandre Julliard 10 Oct '23

10 Oct '23

Module: wine Branch: master Commit: 622daeaf89a08a6073fbb2202b57e64e305d5213 URL: https://gitlab.winehq.org/wine/wine/-/commit/622daeaf89a08a6073fbb2202b57e6… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 6 09:37:47 2023 +0200 dmsynth: Add a trailing linefeed to TRACE() messages. --- dlls/dmsynth/synth.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index a3243d4b683..a3bec8bf3ed 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -79,8 +79,8 @@ static void dump_connectionlist(CONNECTIONLIST *list) UINT i; TRACE("CONNECTIONLIST:\n"); - TRACE(" - cbSize = %lu", list->cbSize); - TRACE(" - cConnections = %lu", list->cConnections); + TRACE(" - cbSize = %lu\n", list->cbSize); + TRACE(" - cConnections = %lu\n", list->cConnections); for (i = 0; i < list->cConnections; i++) {

1 0

Francois Gouget : winewayland.drv: Add a trailing linefeed to a TRACE() message.
by Alexandre Julliard 10 Oct '23

10 Oct '23

Module: wine Branch: master Commit: 484bf58e8d44bc2f292eda201bdf384df82143a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/484bf58e8d44bc2f292eda201bdf38… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 6 09:34:16 2023 +0200 winewayland.drv: Add a trailing linefeed to a TRACE() message. --- dlls/winewayland.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 5079d820929..0cb3ba3a15a 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -342,7 +342,7 @@ static void wayland_configure_window(HWND hwnd) if (!surface->xdg_toplevel) { - TRACE("missing xdg_toplevel, returning"); + TRACE("missing xdg_toplevel, returning\n"); pthread_mutex_unlock(&surface->mutex); return; }

1 0

Nikolay Sivov : vkd3d: Add partial implementation for CreateCommittedResource1().
by Alexandre Julliard 10 Oct '23

10 Oct '23

Module: vkd3d Branch: master Commit: 9c6c7cb78fa6c6106b1a583d70be9f2052dcd210 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9c6c7cb78fa6c6106b1a583d70be9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 9 17:13:40 2023 +0200 vkd3d: Add partial implementation for CreateCommittedResource1(). --- libs/vkd3d/device.c | 19 +++++++++++++++---- libs/vkd3d/resource.c | 6 +++++- libs/vkd3d/vkd3d_private.h | 3 ++- tests/d3d12.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 3e17400a..2d7051f3 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3626,7 +3626,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommittedResource(ID3D12Devi optimized_clear_value, debugstr_guid(iid), resource); if (FAILED(hr = d3d12_committed_resource_create(device, heap_properties, heap_flags, - desc, initial_state, optimized_clear_value, &object))) + desc, initial_state, optimized_clear_value, NULL, &object))) { *resource = NULL; return hr; @@ -4012,12 +4012,23 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommittedResource1(ID3D12Dev const D3D12_CLEAR_VALUE *optimized_clear_value, ID3D12ProtectedResourceSession *protected_session, REFIID iid, void **resource) { - FIXME("iface %p, heap_properties %p, heap_flags %#x, desc %p, initial_state %#x, " - "optimized_clear_value %p, protected_session %p, iid %s, resource %p stub!\n", + struct d3d12_device *device = impl_from_ID3D12Device5(iface); + struct d3d12_resource *object; + HRESULT hr; + + TRACE("iface %p, heap_properties %p, heap_flags %#x, desc %p, initial_state %#x, " + "optimized_clear_value %p, protected_session %p, iid %s, resource %p.\n", iface, heap_properties, heap_flags, desc, initial_state, optimized_clear_value, protected_session, debugstr_guid(iid), resource); - return E_NOTIMPL; + if (FAILED(hr = d3d12_committed_resource_create(device, heap_properties, heap_flags, + desc, initial_state, optimized_clear_value, protected_session, &object))) + { + *resource = NULL; + return hr; + } + + return return_interface(&object->ID3D12Resource_iface, &IID_ID3D12Resource, iid, resource); } static HRESULT STDMETHODCALLTYPE d3d12_device_CreateHeap1(ID3D12Device5 *iface, diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index ad1d2d66..8898c247 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2076,7 +2076,8 @@ static HRESULT vkd3d_allocate_resource_memory( HRESULT d3d12_committed_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) + const D3D12_CLEAR_VALUE *optimized_clear_value, ID3D12ProtectedResourceSession *protected_session, + struct d3d12_resource **resource) { struct d3d12_resource *object; HRESULT hr; @@ -2087,6 +2088,9 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, return E_INVALIDARG; } + if (protected_session) + FIXME("Protected session is not supported.\n"); + if (FAILED(hr = d3d12_resource_create(device, heap_properties, heap_flags, desc, initial_state, optimized_clear_value, &object))) return hr; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 625a4312..2e9845df 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -773,7 +773,8 @@ void d3d12_resource_get_tiling(struct d3d12_device *device, const struct d3d12_r HRESULT d3d12_committed_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource); + const D3D12_CLEAR_VALUE *optimized_clear_value, ID3D12ProtectedResourceSession *protected_session, + struct d3d12_resource **resource); HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, uint64_t heap_offset, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource); diff --git a/tests/d3d12.c b/tests/d3d12.c index 3fa9ec4e..bfbbf804 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1547,6 +1547,7 @@ static void test_create_committed_resource(void) D3D12_CLEAR_VALUE clear_value; D3D12_RESOURCE_STATES state; ID3D12Resource *resource; + ID3D12Device4 *device4; unsigned int i; ULONG refcount; HRESULT hr; @@ -1837,6 +1838,38 @@ static void test_create_committed_resource(void) ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr); } + if (SUCCEEDED(ID3D12Device_QueryInterface(device, &IID_ID3D12Device4, (void **)&device4))) + { + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; + + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Alignment = 0; + resource_desc.Width = 32; + resource_desc.Height = 32; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + + clear_value.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + clear_value.Color[0] = 1.0f; + clear_value.Color[1] = 0.0f; + clear_value.Color[2] = 0.0f; + clear_value.Color[3] = 1.0f; + + hr = ID3D12Device4_CreateCommittedResource1(device4, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr); + ID3D12Resource_Release(resource); + + ID3D12Device4_Release(device4); + } + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); }

1 0

Zebediah Figura : include: Fix some confusingly structured documentation.
by Alexandre Julliard 10 Oct '23

10 Oct '23

Module: vkd3d Branch: master Commit: 72e8b6e0dce8e0422483f69e3e9a18e3a8414e9c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/72e8b6e0dce8e0422483f69e3e9a1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Oct 9 17:15:11 2023 -0500 include: Fix some confusingly structured documentation. Fixes: 7a4ae434dfa4cccc1e832455133930066d2ab575. --- include/vkd3d_shader.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 9d0d768b..f112e7c7 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1387,7 +1387,10 @@ struct vkd3d_shader_descriptor_info * as follows: * * - Each constant register set used by the shader is scanned as a single - * constant buffer descriptor, as follows: + * constant buffer descriptor. + * There may therefore be up to three such descriptors, one for each register + * set used by the shader: float, integer, and boolean. + * The fields are set as follows: * * The \ref vkd3d_shader_descriptor_info.type field is set to * VKD3D_SHADER_DESCRIPTOR_TYPE_CBV. * * The \ref vkd3d_shader_descriptor_info.register_space field is set to zero. @@ -1407,9 +1410,6 @@ struct vkd3d_shader_descriptor_info * * The \ref vkd3d_shader_descriptor_info.register_index field is set to the * binding index of the original sampler, for both descriptors. * * The \ref vkd3d_shader_descriptor_info.count field is set to one. - * - * In summary, there may be up to three such descriptors, one for each register - * set used by the shader: float, integer, and boolean. */ struct vkd3d_shader_scan_descriptor_info {

1 0

Zebediah Figura : vkd3d-shader/ir: Translate TEX instructions to SAMPLE.
by Alexandre Julliard 10 Oct '23

10 Oct '23

Module: vkd3d Branch: master Commit: 6a942581db3093a2e5b5a76334601868e217a60d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6a942581db3093a2e5b5a76334601… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Aug 11 16:46:03 2023 -0500 vkd3d-shader/ir: Translate TEX instructions to SAMPLE. --- libs/vkd3d-shader/ir.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index a97747b5..511b0e8f 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1350,6 +1350,74 @@ static void remove_dead_code(struct vkd3d_shader_parser *parser) } } +static enum vkd3d_result normalise_combined_samplers(struct vkd3d_shader_parser *parser) +{ + unsigned int i; + + for (i = 0; i < parser->instructions.count; ++i) + { + struct vkd3d_shader_instruction *ins = &parser->instructions.elements[i]; + struct vkd3d_shader_src_param *srcs; + + switch (ins->handler_idx) + { + case VKD3DSIH_TEX: + if (!(srcs = shader_src_param_allocator_get(&parser->instructions.src_params, 3))) + return VKD3D_ERROR_OUT_OF_MEMORY; + memset(srcs, 0, sizeof(*srcs) * 3); + + ins->handler_idx = VKD3DSIH_SAMPLE; + + srcs[0] = ins->src[0]; + + srcs[1].reg.type = VKD3DSPR_RESOURCE; + srcs[1].reg.idx[0] = ins->src[1].reg.idx[0]; + srcs[1].reg.idx[1] = ins->src[1].reg.idx[0]; + srcs[1].reg.idx_count = 2; + srcs[1].reg.data_type = VKD3D_DATA_RESOURCE; + srcs[1].swizzle = VKD3D_SHADER_NO_SWIZZLE; + + srcs[2].reg.type = VKD3DSPR_SAMPLER; + srcs[2].reg.idx[0] = ins->src[1].reg.idx[0]; + srcs[2].reg.idx[1] = ins->src[1].reg.idx[0]; + srcs[2].reg.idx_count = 2; + srcs[2].reg.data_type = VKD3D_DATA_SAMPLER; + + ins->src = srcs; + ins->src_count = 3; + break; + + case VKD3DSIH_TEXBEM: + case VKD3DSIH_TEXBEML: + case VKD3DSIH_TEXCOORD: + case VKD3DSIH_TEXDEPTH: + case VKD3DSIH_TEXDP3: + case VKD3DSIH_TEXDP3TEX: + case VKD3DSIH_TEXLDD: + case VKD3DSIH_TEXLDL: + case VKD3DSIH_TEXM3x2PAD: + case VKD3DSIH_TEXM3x2TEX: + case VKD3DSIH_TEXM3x3DIFF: + case VKD3DSIH_TEXM3x3PAD: + case VKD3DSIH_TEXM3x3SPEC: + case VKD3DSIH_TEXM3x3TEX: + case VKD3DSIH_TEXM3x3VSPEC: + case VKD3DSIH_TEXREG2AR: + case VKD3DSIH_TEXREG2GB: + case VKD3DSIH_TEXREG2RGB: + vkd3d_shader_parser_error(parser, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED, + "Aborting due to not yet implemented feature: " + "Combined sampler instruction %#x.", ins->handler_idx); + return VKD3D_ERROR_NOT_IMPLEMENTED; + + default: + break; + } + } + + return VKD3D_OK; +} + enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, const struct vkd3d_shader_compile_info *compile_info) { @@ -1380,6 +1448,9 @@ enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, if (result >= 0) remove_dead_code(parser); + if (result >= 0) + result = normalise_combined_samplers(parser); + if (result >= 0 && TRACE_ON()) vkd3d_shader_trace(instructions, &parser->shader_version);

1 0

Zebediah Figura : vkd3d-shader: Scan combined sampler declarations.
by Alexandre Julliard 10 Oct '23

10 Oct '23

Module: vkd3d Branch: master Commit: bd9eae6c228dc3dfef85e8e5560eccf0e8bb2dea URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bd9eae6c228dc3dfef85e8e5560ec… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Aug 11 15:26:25 2023 -0500 vkd3d-shader: Scan combined sampler declarations. This does not handle 1.x samplers yet. --- libs/vkd3d-shader/vkd3d_shader_main.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index a427d996..9702cf18 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -837,6 +837,15 @@ static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_conte d->flags |= VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE; } +static void vkd3d_shader_scan_combined_sampler_declaration( + struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_semantic *semantic) +{ + vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, &semantic->resource.reg.reg, + &semantic->resource.range, VKD3D_SHADER_RESOURCE_NONE, VKD3D_SHADER_RESOURCE_DATA_UINT); + vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_SRV, &semantic->resource.reg.reg, + &semantic->resource.range, semantic->resource_type, VKD3D_SHADER_RESOURCE_DATA_FLOAT); +} + static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_resource *resource, enum vkd3d_shader_resource_type resource_type, enum vkd3d_shader_resource_data_type resource_data_type, @@ -945,6 +954,12 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte vkd3d_shader_scan_sampler_declaration(context, instruction); break; case VKD3DSIH_DCL: + if (instruction->declaration.semantic.resource.reg.reg.type == VKD3DSPR_COMBINED_SAMPLER) + { + vkd3d_shader_scan_combined_sampler_declaration(context, &instruction->declaration.semantic); + break; + } + /* fall through */ case VKD3DSIH_DCL_UAV_TYPED: vkd3d_shader_scan_typed_resource_declaration(context, instruction); break;

1 0

Zebediah Figura : include: Define an API for mapping sm1 samplers to the target environment.
by Alexandre Julliard 10 Oct '23

10 Oct '23

Module: vkd3d Branch: master Commit: 7a4ae434dfa4cccc1e832455133930066d2ab575 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7a4ae434dfa4cccc1e83245513393… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 7 18:05:09 2023 -0600 include: Define an API for mapping sm1 samplers to the target environment. --- include/vkd3d_shader.h | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 01356ce3..9d0d768b 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1383,16 +1383,30 @@ struct vkd3d_shader_descriptor_info * * This structure extends vkd3d_shader_compile_info. * - * When scanning a legacy Direct3D shader, vkd3d-shader enumerates each - * constant register set used by the shader as a single constant buffer - * descriptor, as follows: - * - The \ref vkd3d_shader_descriptor_info.type field is set to - * VKD3D_SHADER_DESCRIPTOR_TYPE_CBV. - * - The \ref vkd3d_shader_descriptor_info.register_space field is set to zero. - * - The \ref vkd3d_shader_descriptor_info.register_index field is set to a - * member of enum vkd3d_shader_d3dbc_constant_register denoting which set - * is used. - * - The \ref vkd3d_shader_descriptor_info.count field is set to one. + * When scanning a legacy Direct3D shader, vkd3d-shader enumerates descriptors + * as follows: + * + * - Each constant register set used by the shader is scanned as a single + * constant buffer descriptor, as follows: + * * The \ref vkd3d_shader_descriptor_info.type field is set to + * VKD3D_SHADER_DESCRIPTOR_TYPE_CBV. + * * The \ref vkd3d_shader_descriptor_info.register_space field is set to zero. + * * The \ref vkd3d_shader_descriptor_info.register_index field is set to a + * member of enum vkd3d_shader_d3dbc_constant_register denoting which set + * is used. + * * The \ref vkd3d_shader_descriptor_info.count field is set to one. + * - Each sampler used by the shader is scanned as two separate descriptors, + * one representing the texture, and one representing the sampler state. + * If desired, these may be mapped back into a single combined sampler using + * struct vkd3d_shader_combined_resource_sampler. + * The fields are set as follows: + * * The \ref vkd3d_shader_descriptor_info.type field is set to + * VKD3D_SHADER_DESCRIPTOR_TYPE_SRV and VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER + * respectively. + * * The \ref vkd3d_shader_descriptor_info.register_space field is set to zero. + * * The \ref vkd3d_shader_descriptor_info.register_index field is set to the + * binding index of the original sampler, for both descriptors. + * * The \ref vkd3d_shader_descriptor_info.count field is set to one. * * In summary, there may be up to three such descriptors, one for each register * set used by the shader: float, integer, and boolean.

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
71
Older →

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 October 2023