October 2023 - Wine-commits

Rémi Bernon : dmsynth: Create and register a fluid_sfont instance.
by Alexandre Julliard 10 Oct '23

10 Oct '23

Module: wine Branch: master Commit: 907c67ce3cfef4a2b69315c226d3995831f0c5c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/907c67ce3cfef4a2b69315c226d399… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 4 11:40:01 2023 +0200 dmsynth: Create and register a fluid_sfont instance. --- dlls/dmsynth/synth.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 48aa175698d..945889efb6f 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -232,6 +232,7 @@ struct synth struct list waves; fluid_settings_t *fluid_settings; + fluid_sfont_t *fluid_sfont; fluid_synth_t *fluid_synth; }; @@ -304,6 +305,9 @@ static ULONG WINAPI synth_Release(IDirectMusicSynth8 *iface) wave_release(wave); } + fluid_sfont_set_data(This->fluid_sfont, NULL); + delete_fluid_sfont(This->fluid_sfont); + This->fluid_sfont = NULL; delete_fluid_settings(This->fluid_settings); free(This); } @@ -328,6 +332,7 @@ static HRESULT WINAPI synth_Open(IDirectMusicSynth8 *iface, DMUS_PORTPARAMS *par }; UINT size = sizeof(DMUS_PORTPARAMS); BOOL modified = FALSE; + UINT id; TRACE("(%p, %p)\n", This, params); @@ -388,6 +393,8 @@ static HRESULT WINAPI synth_Open(IDirectMusicSynth8 *iface, DMUS_PORTPARAMS *par fluid_settings_setnum(This->fluid_settings, "synth.sample-rate", actual.dwSampleRate); if (!(This->fluid_synth = new_fluid_synth(This->fluid_settings))) return E_OUTOFMEMORY; + if ((id = fluid_synth_add_sfont(This->fluid_synth, This->fluid_sfont)) == FLUID_FAILED) + WARN("Failed to add fluid_sfont to fluid_synth\n"); This->params = actual; This->open = TRUE; @@ -404,6 +411,7 @@ static HRESULT WINAPI synth_Close(IDirectMusicSynth8 *iface) if (!This->open) return DMUS_E_ALREADYCLOSED; + fluid_synth_remove_sfont(This->fluid_synth, This->fluid_sfont); delete_fluid_synth(This->fluid_synth); This->fluid_synth = NULL; This->open = FALSE; @@ -1063,6 +1071,44 @@ static const IKsControlVtbl synth_control_vtbl = synth_control_KsEvent, }; +static const char *synth_sfont_get_name(fluid_sfont_t *fluid_sfont) +{ + return "DirectMusicSynth"; +} + +static fluid_preset_t *synth_sfont_get_preset(fluid_sfont_t *fluid_sfont, int bank, int patch) +{ + struct synth *synth = fluid_sfont_get_data(fluid_sfont); + struct instrument *instrument; + + TRACE("(%p, %d, %d)\n", fluid_sfont, bank, patch); + + if (!synth) return NULL; + + LIST_FOR_EACH_ENTRY(instrument, &synth->instruments, struct instrument, entry) + if (instrument->patch == patch) break; + if (&instrument->entry == &synth->instruments) return NULL; + + FIXME("Preset not implemented yet\n"); + return NULL; +} + +static void synth_sfont_iter_start(fluid_sfont_t *fluid_sfont) +{ + FIXME("(%p): stub\n", fluid_sfont); +} + +static fluid_preset_t *synth_sfont_iter_next(fluid_sfont_t *fluid_sfont) +{ + FIXME("(%p): stub\n", fluid_sfont); + return NULL; +} + +static int synth_sfont_free(fluid_sfont_t *fluid_sfont) +{ + return 0; +} + HRESULT synth_create(IUnknown **ret_iface) { struct synth *obj; @@ -1091,12 +1137,17 @@ HRESULT synth_create(IUnknown **ret_iface) list_init(&obj->waves); if (!(obj->fluid_settings = new_fluid_settings())) goto failed; + if (!(obj->fluid_sfont = new_fluid_sfont(synth_sfont_get_name, synth_sfont_get_preset, + synth_sfont_iter_start, synth_sfont_iter_next, synth_sfont_free))) + goto failed; + fluid_sfont_set_data(obj->fluid_sfont, obj); TRACE("Created DirectMusicSynth %p\n", obj); *ret_iface = (IUnknown *)&obj->IDirectMusicSynth8_iface; return S_OK; failed: + delete_fluid_settings(obj->fluid_settings); free(obj); return E_OUTOFMEMORY; }

1 0

Marcus Meissner : user32/tests: Use correct size to LoadStringW.
by Alexandre Julliard 10 Oct '23

10 Oct '23

Module: wine Branch: master Commit: 9d7c813b5e8ae3fe543475a55a20a60fcca869f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d7c813b5e8ae3fe543475a55a20a6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Oct 10 09:55:54 2023 +0200 user32/tests: Use correct size to LoadStringW. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/user32/tests/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 73f2b46261a..2369aef2a09 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -112,7 +112,7 @@ static void test_LoadStringW(void) { winetest_push_context("Test %u", i); - length1 = LoadStringW(hInst, string_table_tests[i].id, returnedstringw, sizeof(returnedstringw)); + length1 = LoadStringW(hInst, string_table_tests[i].id, returnedstringw, ARRAY_SIZE(returnedstringw)); ok(length1 == wcslen(string_table_tests[i].string), "Got wrong length %d.\n", length1); ok(!wcscmp(returnedstringw, string_table_tests[i].string), "Got wrong string %s.\n", debugstr_w(returnedstringw));

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

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 : 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

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: Introduce a separate register type for combined samplers.
by Alexandre Julliard 10 Oct '23

10 Oct '23

Module: vkd3d Branch: master Commit: 2bcd6ea893f47c8a1ef6d7a86811a1bd9c560c4e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2bcd6ea893f47c8a1ef6d7a86811a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 7 16:45:18 2023 -0600 vkd3d-shader: Introduce a separate register type for combined samplers. --- libs/vkd3d-shader/d3d_asm.c | 3 ++- libs/vkd3d-shader/vkd3d_shader_private.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 620a2d22..38a60735 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -637,7 +637,7 @@ static void shader_dump_decl_usage(struct vkd3d_d3d_asm_compiler *compiler, { struct vkd3d_string_buffer *buffer = &compiler->buffer; - if (semantic->resource.reg.reg.type == VKD3DSPR_SAMPLER) + if (semantic->resource.reg.reg.type == VKD3DSPR_COMBINED_SAMPLER) { switch (semantic->resource_type) { @@ -924,6 +924,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const shader_addline(buffer, "aL"); break; + case VKD3DSPR_COMBINED_SAMPLER: case VKD3DSPR_SAMPLER: shader_addline(buffer, "s"); is_descriptor = true; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index f006d2db..37c96258 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -488,7 +488,7 @@ enum vkd3d_shader_register_type VKD3DSPR_CONSTINT = 7, VKD3DSPR_COLOROUT = 8, VKD3DSPR_DEPTHOUT = 9, - VKD3DSPR_SAMPLER = 10, + VKD3DSPR_COMBINED_SAMPLER = 10, VKD3DSPR_CONST2 = 11, VKD3DSPR_CONST3 = 12, VKD3DSPR_CONST4 = 13, @@ -504,6 +504,7 @@ enum vkd3d_shader_register_type VKD3DSPR_IMMCONSTBUFFER, VKD3DSPR_PRIMID, VKD3DSPR_NULL, + VKD3DSPR_SAMPLER, VKD3DSPR_RESOURCE, VKD3DSPR_UAV, VKD3DSPR_OUTPOINTID,

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

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