- Wine-Commits - list.winehq.org

Rémi Bernon : dinput: Delay input thread start until the first device acquire.
by Alexandre Julliard May 22, 2023

May 22, 2023

Module: wine Branch: master Commit: 88a34c74b0fee3f7dc8c53c92e752a84a1c61923 URL: https://gitlab.winehq.org/wine/wine/-/commit/88a34c74b0fee3f7dc8c53c92e752a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 10 15:57:00 2023 +0200 dinput: Delay input thread start until the first device acquire. Some applications create a IDirectInput and IDirectInputDevice instance from their DllMain procedure, and starting the thread on the first user creation and waiting for it to start will deadlock on the loader lock. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54916 --- dlls/dinput/dinput_main.c | 80 ++++++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 36 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 0d502821966..51e1a134023 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -89,28 +89,6 @@ static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0 static struct list acquired_device_list = LIST_INIT( acquired_device_list ); -void dinput_hooks_acquire_device( IDirectInputDevice8W *iface ) -{ - struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); - - EnterCriticalSection( &dinput_hook_crit ); - list_add_tail( &acquired_device_list, &impl->entry ); - LeaveCriticalSection( &dinput_hook_crit ); - - SendMessageW( di_em_win, INPUT_THREAD_NOTIFY, NOTIFY_REFRESH_DEVICES, 0 ); -} - -void dinput_hooks_unacquire_device( IDirectInputDevice8W *iface ) -{ - struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); - - EnterCriticalSection( &dinput_hook_crit ); - list_remove( &impl->entry ); - LeaveCriticalSection( &dinput_hook_crit ); - - SendMessageW( di_em_win, INPUT_THREAD_NOTIFY, NOTIFY_REFRESH_DEVICES, 0 ); -} - static void unhook_device_window_foreground_changes( struct dinput_device *device ) { if (!device->cbt_hook) return; @@ -429,37 +407,67 @@ static DWORD WINAPI dinput_thread_proc( void *params ) return 0; } -void input_thread_add_user(void) +void input_thread_start(void) { + HANDLE start_event; + + TRACE( "Starting input thread.\n" ); + + if (!(start_event = CreateEventW( NULL, FALSE, FALSE, NULL ))) + ERR( "Failed to create start event, error %lu\n", GetLastError() ); + else if (!(dinput_thread = CreateThread( NULL, 0, dinput_thread_proc, start_event, 0, NULL ))) + ERR( "Failed to create internal thread, error %lu\n", GetLastError() ); + else + WaitForSingleObject( start_event, INFINITE ); + + CloseHandle( start_event ); +} + +void dinput_hooks_acquire_device( IDirectInputDevice8W *iface ) +{ + struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); + EnterCriticalSection( &dinput_hook_crit ); - if (!input_thread_user_count++) - { - HANDLE start_event; + /* start the input thread now if it wasn't started already */ + if (!dinput_thread) input_thread_start(); + list_add_tail( &acquired_device_list, &impl->entry ); + LeaveCriticalSection( &dinput_hook_crit ); - TRACE( "Starting input thread.\n" ); + SendMessageW( di_em_win, INPUT_THREAD_NOTIFY, NOTIFY_REFRESH_DEVICES, 0 ); +} - if (!(start_event = CreateEventW( NULL, FALSE, FALSE, NULL ))) - ERR( "Failed to create start event, error %lu\n", GetLastError() ); - else if (!(dinput_thread = CreateThread( NULL, 0, dinput_thread_proc, start_event, 0, NULL ))) - ERR( "Failed to create internal thread, error %lu\n", GetLastError() ); - else - WaitForSingleObject( start_event, INFINITE ); +void dinput_hooks_unacquire_device( IDirectInputDevice8W *iface ) +{ + struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); - CloseHandle( start_event ); - } + EnterCriticalSection( &dinput_hook_crit ); + list_remove( &impl->entry ); + LeaveCriticalSection( &dinput_hook_crit ); + + SendMessageW( di_em_win, INPUT_THREAD_NOTIFY, NOTIFY_REFRESH_DEVICES, 0 ); +} + +void input_thread_add_user(void) +{ + /* we cannot start the input thread here because some games create dinput objects from their DllMain, and + * starting the thread will wait for it to initialize, which requires the loader lock to be released. + */ + EnterCriticalSection( &dinput_hook_crit ); + input_thread_user_count++; LeaveCriticalSection( &dinput_hook_crit ); } void input_thread_remove_user(void) { EnterCriticalSection( &dinput_hook_crit ); - if (!--input_thread_user_count) + if (!--input_thread_user_count && dinput_thread) { TRACE( "Stopping input thread.\n" ); SendMessageW( di_em_win, INPUT_THREAD_NOTIFY, NOTIFY_THREAD_STOP, 0 ); WaitForSingleObject( dinput_thread, INFINITE ); CloseHandle( dinput_thread ); + dinput_thread = NULL; } LeaveCriticalSection( &dinput_hook_crit ); }

1 0

Rémi Bernon : dinput: Avoid remapping already mapped objects in BuildActionMap.
by Alexandre Julliard May 22, 2023

May 22, 2023

Module: wine Branch: master Commit: cb7bb2284c37d0dbd58bfe72594fabb7ab398e05 URL: https://gitlab.winehq.org/wine/wine/-/commit/cb7bb2284c37d0dbd58bfe72594fab… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 19 21:38:14 2023 +0200 dinput: Avoid remapping already mapped objects in BuildActionMap. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54917 --- dlls/dinput/device.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index b761b3e9d6d..427d3895700 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1866,6 +1866,23 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, if (!(mapped = calloc( impl->device_format.dwNumObjs, sizeof(*mapped) ))) return DIERR_OUTOFMEMORY; + /* check already mapped objects */ + action_end = format->rgoAction + format->dwNumActions; + for (action = format->rgoAction; action < action_end; action++) + { + if (!action->dwHow || !action->dwObjID) continue; + if (!IsEqualGUID(&action->guidInstance, &impl->guid)) continue; + + object_end = impl->device_format.rgodf + impl->device_format.dwNumObjs; + for (object = impl->device_format.rgodf; object < object_end; object++) + { + if (action->dwObjID != object->dwType) continue; + mapped[object - impl->device_format.rgodf] = TRUE; + break; + } + } + + /* map any unmapped priority 1 objects */ action_end = format->rgoAction + format->dwNumActions; for (action = format->rgoAction; action < action_end; action++) { @@ -1886,6 +1903,7 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, } } + /* map any unmapped priority 2 objects */ for (action = format->rgoAction; action < action_end; action++) { if (action->dwHow || (action->dwFlags & DIA_APPNOMAP)) continue; /* already mapped */

1 0

Jinoh Kang : imm32: Don't erroneously start composition when handling IMC_SETOPENSTATUS.
by Alexandre Julliard May 22, 2023

May 22, 2023

Module: wine Branch: master Commit: 839a53797efd85407f7db747272fff64586ee92d URL: https://gitlab.winehq.org/wine/wine/-/commit/839a53797efd85407f7db747272fff… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat May 20 23:34:23 2023 +0900 imm32: Don't erroneously start composition when handling IMC_SETOPENSTATUS. Fixes: 8ae0c308233e61cfc01ef52886077960d6513d93 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54965 --- dlls/imm32/ime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c index 10fd234a2c1..e15367f5fa8 100644 --- a/dlls/imm32/ime.c +++ b/dlls/imm32/ime.c @@ -657,7 +657,7 @@ BOOL WINAPI NotifyIME( HIMC himc, DWORD action, DWORD index, DWORD value ) if (!ctx->fOpen) { input_context_set_comp_str( ctx, NULL, 0 ); - if ((msg = ime_set_composition_status( himc, TRUE ))) ime_send_message( himc, msg, 0, 0 ); + if ((msg = ime_set_composition_status( himc, FALSE ))) ime_send_message( himc, msg, 0, 0 ); } NtUserNotifyIMEStatus( ctx->hWnd, ctx->fOpen ); break;

1 0

Zebediah Figura : tests: Add support for UAV buffers in the d3d11 runner.
by Alexandre Julliard May 22, 2023

May 22, 2023

Module: vkd3d Branch: master Commit: 66dab357ebd72c8b0f0e46d7dc01c837d2bec600 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/66dab357ebd72c8b0f0e46d7dc01c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 17 23:09:20 2023 +0200 tests: Add support for UAV buffers in the d3d11 runner. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/shader_runner_d3d11.c | 66 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 52 insertions(+), 14 deletions(-) diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index e9179b58..3907e785 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -44,6 +44,7 @@ struct d3d11_resource struct resource r; ID3D11Resource *resource; + ID3D11Buffer *buffer; ID3D11Texture2D *texture; ID3D11RenderTargetView *rtv; ID3D11ShaderResourceView *srv; @@ -350,7 +351,6 @@ static struct resource *d3d11_runner_create_resource(struct shader_runner *r, co case RESOURCE_TYPE_RENDER_TARGET: case RESOURCE_TYPE_TEXTURE: case RESOURCE_TYPE_UAV: - case RESOURCE_TYPE_BUFFER_UAV: { D3D11_SUBRESOURCE_DATA resource_data[2]; D3D11_TEXTURE2D_DESC desc = {0}; @@ -365,7 +365,7 @@ static struct resource *d3d11_runner_create_resource(struct shader_runner *r, co desc.Format = params->format; desc.SampleDesc.Count = 1; desc.Usage = D3D11_USAGE_DEFAULT; - if (params->type == RESOURCE_TYPE_UAV || params->type == RESOURCE_TYPE_BUFFER_UAV) + if (params->type == RESOURCE_TYPE_UAV) desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; else if (params->type == RESOURCE_TYPE_RENDER_TARGET) desc.BindFlags = D3D11_BIND_RENDER_TARGET; @@ -395,7 +395,7 @@ static struct resource *d3d11_runner_create_resource(struct shader_runner *r, co ok(hr == S_OK, "Failed to create texture, hr %#lx.\n", hr); resource->resource = (ID3D11Resource *)resource->texture; - if (params->type == RESOURCE_TYPE_UAV || params->type == RESOURCE_TYPE_BUFFER_UAV) + if (params->type == RESOURCE_TYPE_UAV) hr = ID3D11Device_CreateUnorderedAccessView(device, resource->resource, NULL, &resource->uav); else if (params->type == RESOURCE_TYPE_RENDER_TARGET) hr = ID3D11Device_CreateRenderTargetView(device, resource->resource, NULL, &resource->rtv); @@ -405,9 +405,26 @@ static struct resource *d3d11_runner_create_resource(struct shader_runner *r, co break; } + case RESOURCE_TYPE_BUFFER_UAV: + { + D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; + + resource->buffer = create_buffer(device, D3D11_BIND_UNORDERED_ACCESS, params->data_size, params->data); + resource->resource = (ID3D11Resource *)resource->buffer; + + uav_desc.Format = params->format; + uav_desc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER; + uav_desc.Buffer.FirstElement = 0; + uav_desc.Buffer.NumElements = params->data_size / params->texel_size; + uav_desc.Buffer.Flags = 0; + hr = ID3D11Device_CreateUnorderedAccessView(device, resource->resource, &uav_desc, &resource->uav); + ok(hr == S_OK, "Failed to create view, hr %#lx.\n", hr); + break; + } + case RESOURCE_TYPE_VERTEX_BUFFER: - resource->resource = (ID3D11Resource *)create_buffer(device, - D3D11_BIND_VERTEX_BUFFER, params->data_size, params->data); + resource->buffer = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, params->data_size, params->data); + resource->resource = (ID3D11Resource *)resource->buffer; break; } @@ -652,15 +669,36 @@ static struct resource_readback *d3d11_runner_get_resource_readback(struct shade struct d3d11_resource *resource = d3d11_resource(res); D3D11_TEXTURE2D_DESC texture_desc; D3D11_MAPPED_SUBRESOURCE map_desc; + D3D11_BUFFER_DESC buffer_desc; HRESULT hr; - ID3D11Texture2D_GetDesc(resource->texture, &texture_desc); - texture_desc.Usage = D3D11_USAGE_STAGING; - texture_desc.BindFlags = 0; - texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; - texture_desc.MiscFlags = 0; - hr = ID3D11Device_CreateTexture2D(runner->device, &texture_desc, NULL, (ID3D11Texture2D **)&rb->resource); - ok(hr == S_OK, "Failed to create texture, hr %#lx.\n", hr); + switch (resource->r.type) + { + case RESOURCE_TYPE_BUFFER_UAV: + ID3D11Buffer_GetDesc(resource->buffer, &buffer_desc); + buffer_desc.Usage = D3D11_USAGE_STAGING; + buffer_desc.BindFlags = 0; + buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; + buffer_desc.MiscFlags = 0; + hr = ID3D11Device_CreateBuffer(runner->device, &buffer_desc, NULL, (ID3D11Buffer **)&rb->resource); + ok(hr == S_OK, "Failed to create buffer, hr %#lx.\n", hr); + break; + + case RESOURCE_TYPE_RENDER_TARGET: + case RESOURCE_TYPE_UAV: + ID3D11Texture2D_GetDesc(resource->texture, &texture_desc); + texture_desc.Usage = D3D11_USAGE_STAGING; + texture_desc.BindFlags = 0; + texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(runner->device, &texture_desc, NULL, (ID3D11Texture2D **)&rb->resource); + ok(hr == S_OK, "Failed to create texture, hr %#lx.\n", hr); + break; + + case RESOURCE_TYPE_VERTEX_BUFFER: + case RESOURCE_TYPE_TEXTURE: + assert(0); + } ID3D11DeviceContext_CopyResource(runner->immediate_context, rb->resource, resource->resource); hr = ID3D11DeviceContext_Map(runner->immediate_context, rb->resource, 0, D3D11_MAP_READ, 0, &map_desc); @@ -668,8 +706,8 @@ static struct resource_readback *d3d11_runner_get_resource_readback(struct shade rb->rb.data = map_desc.pData; rb->rb.row_pitch = map_desc.RowPitch; - rb->rb.width = texture_desc.Width; - rb->rb.height = texture_desc.Height; + rb->rb.width = resource->r.width; + rb->rb.height = resource->r.height; rb->rb.depth = 1; return &rb->rb; }

1 0

Nikolay Sivov : tests: Add RWBuffer writing test.
by Alexandre Julliard May 22, 2023

May 22, 2023

Module: vkd3d Branch: master Commit: 1af662ae5038d78b2069410f36fd7a08afea5cf6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1af662ae5038d78b2069410f36fd7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 10 10:01:05 2023 +0200 tests: Add RWBuffer writing test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/uav-rwbuffer.shader_test | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/tests/uav-rwbuffer.shader_test b/tests/uav-rwbuffer.shader_test index 0446e161..1a7fcf1e 100644 --- a/tests/uav-rwbuffer.shader_test +++ b/tests/uav-rwbuffer.shader_test @@ -1,6 +1,15 @@ [require] shader model >= 5.0 +% UAVs are implicitly allocated starting from the highest render target slot. +% They cannot overlap render target slots, and also cannot be allocated any +% lower than the highest render target. +% This ceases to be true with shader model 5.1. + +[render target 1] +format r32g32b32a32 float +size (640, 480) + [pixel shader] struct s { @@ -78,3 +87,21 @@ float4 main() : sv_target1 { return 0; } + +[buffer uav 2] +size (1, 1) + +0.1 0.2 0.3 0.4 + +[pixel shader] +RWBuffer<float4> u : register(u2); + +float4 main() : sv_target1 +{ + u[0] = float4(11.1, 12.2, 13.3, 14.4); + return 0; +} + +[test] +draw quad +probe buffer uav 2 (0, 0) rgba (11.1, 12.2, 13.3, 14.4)

1 0

Nikolay Sivov : tests: Add support for UAV buffers to d3d12 runner.
by Alexandre Julliard May 22, 2023

May 22, 2023

Module: vkd3d Branch: master Commit: f470c00453cb76214c93073d00afeac5a4d152f1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f470c00453cb76214c93073d00afe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 18 12:46:33 2023 +0200 tests: Add support for UAV buffers to d3d12 runner. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/d3d12.c | 25 ----------- tests/d3d12_test_utils.h | 101 ++++++++++++++++++++++++++++++-------------- tests/shader_runner_d3d12.c | 29 ++++++++++++- 3 files changed, 96 insertions(+), 59 deletions(-)

1 0

Nikolay Sivov : tests: Rename readback helper to be more generic.
by Alexandre Julliard May 22, 2023

May 22, 2023

Module: vkd3d Branch: master Commit: 74c0ad0a7a832ff89b66d494f2c51a4dee164e11 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/74c0ad0a7a832ff89b66d494f2c51… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 18 12:28:26 2023 +0200 tests: Rename readback helper to be more generic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/d3d12.c | 124 ++++++++++++++++++++++---------------------- tests/d3d12_test_utils.h | 20 +++---- tests/hlsl_d3d12.c | 6 +-- tests/shader_runner_d3d12.c | 2 +- 4 files changed, 76 insertions(+), 76 deletions(-)

1 0

Nikolay Sivov : tests: Add support for UAV buffers in Vulkan runner.
by Alexandre Julliard May 22, 2023

May 22, 2023

Module: vkd3d Branch: master Commit: a4ebde202a83a9eedf226ca1648dba6a4bce4f8f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a4ebde202a83a9eedf226ca1648db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 9 19:56:55 2023 +0200 tests: Add support for UAV buffers in Vulkan runner. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/shader_runner.c | 23 +++++++++ tests/shader_runner.h | 1 + tests/shader_runner_d3d11.c | 7 ++- tests/shader_runner_d3d12.c | 4 ++ tests/shader_runner_d3d9.c | 2 + tests/shader_runner_vulkan.c | 118 +++++++++++++++++++++++++++++++++---------- tests/vulkan_procs.h | 2 + 7 files changed, 128 insertions(+), 29 deletions(-)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add support for writing RWStructuredBuffer declarations.
by Alexandre Julliard May 22, 2023

May 22, 2023

Module: vkd3d Branch: master Commit: cff22ecde8b39651a413727f1ea4632fe1872a35 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cff22ecde8b39651a413727f1ea46… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 16 12:55:31 2023 +0200 vkd3d-shader/hlsl: Add support for writing RWStructuredBuffer declarations. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 2 ++ libs/vkd3d-shader/hlsl.h | 6 ++++-- libs/vkd3d-shader/hlsl.l | 1 + libs/vkd3d-shader/hlsl.y | 5 +++++ libs/vkd3d-shader/tpf.c | 37 ++++++++++++++++++++++++++++++++++--- 5 files changed, 46 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 6ddd64d6..ed0b3a40 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2039,6 +2039,8 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru case HLSL_TYPE_UAV: if (type->sampler_dim == HLSL_SAMPLER_DIM_BUFFER) vkd3d_string_buffer_printf(string, "RWBuffer"); + else if (type->sampler_dim == HLSL_SAMPLER_DIM_STRUCTURED_BUFFER) + vkd3d_string_buffer_printf(string, "RWStructuredBuffer"); else vkd3d_string_buffer_printf(string, "RWTexture%s", dimensions[type->sampler_dim]); if ((inner_string = hlsl_type_to_string(ctx, type->e.resource_format))) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 89bd3f8d..4ebc63f7 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -117,7 +117,8 @@ enum hlsl_sampler_dim HLSL_SAMPLER_DIM_CUBEARRAY, HLSL_SAMPLER_DIM_LAST_TEXTURE = HLSL_SAMPLER_DIM_CUBEARRAY, HLSL_SAMPLER_DIM_BUFFER, - HLSL_SAMPLER_DIM_MAX = HLSL_SAMPLER_DIM_BUFFER, + HLSL_SAMPLER_DIM_STRUCTURED_BUFFER, + HLSL_SAMPLER_DIM_MAX = HLSL_SAMPLER_DIM_STRUCTURED_BUFFER, }; enum hlsl_regset @@ -148,7 +149,7 @@ struct hlsl_type * If base_type is HLSL_TYPE_TEXTURE, then sampler_dim is <= HLSL_SAMPLER_DIM_LAST_TEXTURE. * If base_type is HLSL_TYPE_UAV, then sampler_dim must be one of HLSL_SAMPLER_DIM_1D, * HLSL_SAMPLER_DIM_2D, HLSL_SAMPLER_DIM_3D, HLSL_SAMPLER_DIM_1DARRAY, HLSL_SAMPLER_DIM_2DARRAY, - * or HLSL_SAMPLER_DIM_BUFFER. + * HLSL_SAMPLER_DIM_BUFFER, or HLSL_SAMPLER_DIM_STRUCTURED_BUFFER. * Otherwise, sampler_dim is not used */ enum hlsl_sampler_dim sampler_dim; /* Name, in case the type is a named struct or a typedef. */ @@ -1027,6 +1028,7 @@ static inline unsigned int hlsl_sampler_dim_count(enum hlsl_sampler_dim dim) { case HLSL_SAMPLER_DIM_1D: case HLSL_SAMPLER_DIM_BUFFER: + case HLSL_SAMPLER_DIM_STRUCTURED_BUFFER: return 1; case HLSL_SAMPLER_DIM_1DARRAY: case HLSL_SAMPLER_DIM_2D: diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 1bc92789..e9ae3ccf 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -105,6 +105,7 @@ RenderTargetView {return KW_RENDERTARGETVIEW; } return {return KW_RETURN; } register {return KW_REGISTER; } RWBuffer {return KW_RWBUFFER; } +RWStructuredBuffer {return KW_RWSTRUCTUREDBUFFER; } RWTexture1D {return KW_RWTEXTURE1D; } RWTexture2D {return KW_RWTEXTURE2D; } RWTexture3D {return KW_RWTEXTURE3D; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index fee563a6..c0cb6880 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4147,6 +4147,7 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %token KW_REGISTER %token KW_ROW_MAJOR %token KW_RWBUFFER +%token KW_RWSTRUCTUREDBUFFER %token KW_RWTEXTURE1D %token KW_RWTEXTURE2D %token KW_RWTEXTURE3D @@ -4960,6 +4961,10 @@ uav_type: { $$ = HLSL_SAMPLER_DIM_BUFFER; } + | KW_RWSTRUCTUREDBUFFER + { + $$ = HLSL_SAMPLER_DIM_STRUCTURED_BUFFER; + } | KW_RWTEXTURE1D { $$ = HLSL_SAMPLER_DIM_1D; diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 8b267fc9..7c8541f0 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2960,6 +2960,7 @@ static D3D_SRV_DIMENSION sm4_rdef_resource_dimension(const struct hlsl_type *typ case HLSL_SAMPLER_DIM_CUBEARRAY: return D3D_SRV_DIMENSION_TEXTURECUBEARRAY; case HLSL_SAMPLER_DIM_BUFFER: + case HLSL_SAMPLER_DIM_STRUCTURED_BUFFER: return D3D_SRV_DIMENSION_BUFFER; default: vkd3d_unreachable(); @@ -3261,6 +3262,7 @@ static enum vkd3d_sm4_resource_type sm4_resource_dimension(const struct hlsl_typ case HLSL_SAMPLER_DIM_CUBEARRAY: return VKD3D_SM4_RESOURCE_TEXTURE_CUBEARRAY; case HLSL_SAMPLER_DIM_BUFFER: + case HLSL_SAMPLER_DIM_STRUCTURED_BUFFER: return VKD3D_SM4_RESOURCE_BUFFER; default: vkd3d_unreachable(); @@ -3336,6 +3338,8 @@ struct sm4_instruction } srcs[4]; unsigned int src_count; + unsigned int byte_stride; + uint32_t idx[3]; unsigned int idx_count; }; @@ -3570,6 +3574,8 @@ static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const st for (i = 0; i < instr->src_count; ++i) size += sm4_register_order(&instr->srcs[i].reg); size += instr->idx_count; + if (instr->byte_stride) + ++size; token |= (size << VKD3D_SM4_INSTRUCTION_LENGTH_SHIFT); @@ -3624,6 +3630,9 @@ static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const st } } + if (instr->byte_stride) + put_u32(buffer, instr->byte_stride); + for (j = 0; j < instr->idx_count; ++j) put_u32(buffer, instr->idx[j]); } @@ -3709,9 +3718,6 @@ static void write_sm4_dcl_textures(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b instr = (struct sm4_instruction) { - .opcode = (uav ? VKD3D_SM5_OP_DCL_UAV_TYPED : VKD3D_SM4_OP_DCL_RESOURCE) - | (sm4_resource_dimension(component_type) << VKD3D_SM4_RESOURCE_TYPE_SHIFT), - .dsts[0].reg.type = uav ? VKD3D_SM5_RT_UAV : VKD3D_SM4_RT_RESOURCE, .dsts[0].reg.idx = {var->regs[regset].id + i}, .dsts[0].reg.idx_count = 1, @@ -3721,6 +3727,25 @@ static void write_sm4_dcl_textures(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b .idx_count = 1, }; + if (uav) + { + switch (var->data_type->sampler_dim) + { + case HLSL_SAMPLER_DIM_STRUCTURED_BUFFER: + instr.opcode = VKD3D_SM5_OP_DCL_UAV_STRUCTURED; + instr.byte_stride = var->data_type->e.resource_format->reg_size[HLSL_REGSET_NUMERIC] * 4; + break; + default: + instr.opcode = VKD3D_SM5_OP_DCL_UAV_TYPED; + break; + } + } + else + { + instr.opcode = VKD3D_SM4_OP_DCL_RESOURCE; + } + instr.opcode |= (sm4_resource_dimension(component_type) << VKD3D_SM4_RESOURCE_TYPE_SHIFT); + if (component_type->sampler_dim == HLSL_SAMPLER_DIM_2DMS || component_type->sampler_dim == HLSL_SAMPLER_DIM_2DMSARRAY) { @@ -4964,6 +4989,12 @@ static void write_sm4_resource_store(struct hlsl_ctx *ctx, return; } + if (resource_type->sampler_dim == HLSL_SAMPLER_DIM_STRUCTURED_BUFFER) + { + hlsl_fixme(ctx, &store->node.loc, "Structured buffers store is not implemented.\n"); + return; + } + write_sm4_store_uav_typed(ctx, buffer, &store->resource, store->coords.node, store->value.node); }

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Improve UAV format type checking for buffer types.
by Alexandre Julliard May 22, 2023

May 22, 2023

Module: vkd3d Branch: master Commit: cf8cacd33672aff43fde5ff946b96b461a2d07dc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cf8cacd33672aff43fde5ff946b96… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 4 01:25:24 2023 +0200 vkd3d-shader/hlsl: Improve UAV format type checking for buffer types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Makefile.am | 4 +- libs/vkd3d-shader/hlsl.y | 38 ++++- tests/uav-rwbuffer.shader_test | 80 ++++++++++ tests/uav-rwstructuredbuffer.shader_test | 57 +++++++ .../{uav.shader_test => uav-rwtexture.shader_test} | 168 +++++++++++++++++++++ 5 files changed, 340 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index e06d0eeb..8db1bf8c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -173,9 +173,11 @@ vkd3d_shader_tests = \ tests/texture-load-offset.shader_test \ tests/texture-load-typed.shader_test \ tests/trigonometry.shader_test \ - tests/uav.shader_test \ tests/uav-load.shader_test \ tests/uav-out-param.shader_test \ + tests/uav-rwbuffer.shader_test \ + tests/uav-rwstructuredbuffer.shader_test \ + tests/uav-rwtexture.shader_test \ tests/writemask-assignop-0.shader_test \ tests/writemask-assignop-1.shader_test \ tests/writemask-assignop-2.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c0cb6880..7c6c2233 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -5097,16 +5097,42 @@ type_no_void: } | uav_type '<' type '>' { - if ($3->class > HLSL_CLASS_VECTOR) - { - struct vkd3d_string_buffer *string; + struct vkd3d_string_buffer *string = hlsl_type_to_string(ctx, $3); - string = hlsl_type_to_string(ctx, $3); + if (!type_contains_only_numerics($3)) + { if (string) hlsl_error(ctx, &@3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "UAV data type %s is not scalar or vector.", string->buffer); - hlsl_release_string_buffer(ctx, string); + "UAV type %s is not numeric.", string->buffer); } + + switch ($1) + { + case HLSL_SAMPLER_DIM_BUFFER: + case HLSL_SAMPLER_DIM_1D: + case HLSL_SAMPLER_DIM_2D: + case HLSL_SAMPLER_DIM_3D: + if ($3->class == HLSL_CLASS_ARRAY) + { + if (string) + hlsl_error(ctx, &@3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "This type of UAV does not support array type."); + } + else if (hlsl_type_component_count($3) > 4) + { + if (string) + hlsl_error(ctx, &@3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "UAV data type %s size exceeds maximum size.", string->buffer); + } + break; + case HLSL_SAMPLER_DIM_STRUCTURED_BUFFER: + break; + default: + vkd3d_unreachable(); + } + + hlsl_release_string_buffer(ctx, string); + $$ = hlsl_new_uav_type(ctx, $1, $3); } | TYPE_IDENTIFIER diff --git a/tests/uav-rwbuffer.shader_test b/tests/uav-rwbuffer.shader_test new file mode 100644 index 00000000..0446e161 --- /dev/null +++ b/tests/uav-rwbuffer.shader_test @@ -0,0 +1,80 @@ +[require] +shader model >= 5.0 + +[pixel shader] +struct s +{ + float3 a; +}; + +RWBuffer<float4> u : register(u2); +RWBuffer<float> u1; +RWBuffer<float2x2> u2; +RWBuffer<struct s> u3; + +float4 main() : sv_target1 +{ + u[0] = float4(11.1, 12.2, 13.3, 14.4); + return 0; +} + +% Type size is too wide +[pixel shader fail] +struct s +{ + float3 a; + float2 b; +}; +RWBuffer<struct s> u; + +float4 main() : sv_target1 +{ + return 0; +} + +[pixel shader fail todo] +RWBuffer<double3> u; + +float4 main() : sv_target1 +{ + return 0; +} + +[pixel shader] +RWBuffer<double2> u; + +float4 main() : sv_target1 +{ + return 0; +} + +% Array type +[pixel shader fail] +typedef float arr[2]; +RWBuffer<arr> u; + +float4 main() : sv_target1 +{ + return 0; +} + +% Object types +[pixel shader fail] +RWBuffer<Texture2D> u; + +float4 main() : sv_target1 +{ + return 0; +} + +[pixel shader fail] +struct s +{ + Texture2D t; +}; +RWBuffer<struct s> u; + +float4 main() : sv_target1 +{ + return 0; +} diff --git a/tests/uav-rwstructuredbuffer.shader_test b/tests/uav-rwstructuredbuffer.shader_test new file mode 100644 index 00000000..5ea67329 --- /dev/null +++ b/tests/uav-rwstructuredbuffer.shader_test @@ -0,0 +1,57 @@ +[require] +shader model >= 5.0 + +[pixel shader todo] +struct s +{ + float3 a; +}; + +struct s2 +{ + float4x4 f1, f2, f3; +}; + +RWStructuredBuffer<float4> u : register(u2); +RWStructuredBuffer<float> u1; +RWStructuredBuffer<float2x2> u2; +RWStructuredBuffer<struct s> u3; +RWStructuredBuffer<float4x4> u4; +RWStructuredBuffer<struct s2> u5; + +float4 main() : sv_target1 +{ + u[0] = float4(11.1, 12.2, 13.3, 14.4); + return 0; +} + +% Array type +[pixel shader] +typedef float arr[2]; +RWStructuredBuffer<arr> u; + +float4 main() : sv_target1 +{ + return 0; +} + +% Object types +[pixel shader fail] +RWStructuredBuffer<Texture2D> u; + +float4 main() : sv_target1 +{ + return 0; +} + +[pixel shader fail] +struct s +{ + Texture2D t; +}; +RWStructuredBuffer<struct s> u; + +float4 main() : sv_target1 +{ + return 0; +} diff --git a/tests/uav.shader_test b/tests/uav-rwtexture.shader_test similarity index 57% rename from tests/uav.shader_test rename to tests/uav-rwtexture.shader_test index 9740575c..07c28cb8 100644 --- a/tests/uav.shader_test +++ b/tests/uav-rwtexture.shader_test @@ -161,3 +161,171 @@ float4 main() : sv_target1 draw quad probe uav 2 (0, 0) rgba (1.1, 1.2, 1.3, 1.4) probe uav 3 (0, 0) rgba (2.1, 2.2, 2.3, 2.4) + +% RWTexture1D types +[pixel shader] +struct s +{ + float3 a; +}; + +RWTexture1D<float4> u : register(u2); +RWTexture1D<float> u1; +RWTexture1D<float2x2> u2; +RWTexture1D<struct s> u3; + +float4 main() : sv_target1 +{ + u[0] = float4(11.1, 12.2, 13.3, 14.4); + return 0; +} + +% RWTexture2D types +[pixel shader] +struct s +{ + float3 a; +}; + +RWTexture2D<float4> u : register(u2); +RWTexture2D<float> u1; +RWTexture2D<float2x2> u2; +RWTexture2D<struct s> u3; + +float4 main() : sv_target1 +{ + u[int2(0, 0)] = float4(11.1, 12.2, 13.3, 14.4); + return 0; +} + +% RWTexture3D types +[pixel shader] +struct s +{ + float3 a; +}; + +RWTexture3D<float4> u : register(u2); +RWTexture3D<float> u1; +RWTexture3D<float2x2> u2; +RWTexture3D<struct s> u3; + +float4 main() : sv_target1 +{ + u[int3(0, 0, 0)] = float4(11.1, 12.2, 13.3, 14.4); + return 0; +} + +% Type is too wide +[pixel shader fail] +struct s +{ + float3 a; + float2 b; +}; +RWTexture1D<struct s> u; + +float4 main() : sv_target1 +{ + return 0; +} + +[pixel shader fail] +struct s +{ + float3 a; + float2 b; +}; +RWTexture2D<struct s> u; + +float4 main() : sv_target1 +{ + return 0; +} + +[pixel shader fail] +struct s +{ + float3 a; + float2 b; +}; +RWTexture3D<struct s> u; + +float4 main() : sv_target1 +{ + return 0; +} + +% Array type +[pixel shader fail] +typedef float arr[2]; +RWTexture1D<arr> u; + +float4 main() : sv_target1 +{ + return 0; +} + +% Object types +[pixel shader fail] +RWTexture1D<Texture2D> u; + +float4 main() : sv_target1 +{ + return 0; +} + +[pixel shader fail] +RWTexture2D<Texture2D> u; + +float4 main() : sv_target1 +{ + return 0; +} + +[pixel shader fail] +RWTexture3D<Texture2D> u; + +float4 main() : sv_target1 +{ + return 0; +} + +[pixel shader fail] +struct s +{ + Texture2D t; +}; + +RWTexture1D<struct s> u; + +float4 main() : sv_target1 +{ + return 0; +} + +[pixel shader fail] +struct s +{ + Texture2D t; +}; + +RWTexture2D<struct s> u; + +float4 main() : sv_target1 +{ + return 0; +} + +[pixel shader fail] +struct s +{ + Texture2D t; +}; + +RWTexture3D<struct s> u; + +float4 main() : sv_target1 +{ + return 0; +}

1 0