June 2021 - Wine-Commits - list.winehq.org

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_GET_SO_ERROR.
by Alexandre Julliard June 24, 2021

June 24, 2021

Module: wine Branch: master Commit: fb3956fcf94397bed53598943a9524520bc23e08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb3956fcf94397bed5359894… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 00:00:11 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_GET_SO_ERROR. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 41 +---------------------------------------- dlls/ws2_32/tests/sock.c | 2 -- 2 files changed, 1 insertion(+), 42 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ab111f726a9..b183b85b0b3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -694,19 +694,6 @@ static inline void release_sock_fd( SOCKET s, int fd ) close( fd ); } -static void _get_sock_errors(SOCKET s, int *events) -{ - SERVER_START_REQ( get_socket_event ) - { - req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); - req->service = FALSE; - req->c_event = 0; - wine_server_set_reply( req, events, sizeof(int) * FD_MAX_EVENTS ); - wine_server_call( req ); - } - SERVER_END_REQ; -} - static int _get_fd_type(int fd) { int sock_type = -1; @@ -2236,33 +2223,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return 0; case WS_SO_ERROR: - { - if ( (fd = get_sock_fd( s, 0, NULL )) == -1) - return SOCKET_ERROR; - if (getsockopt(fd, SOL_SOCKET, SO_ERROR, optval, (socklen_t *)optlen) != 0 ) - { - SetLastError(wsaErrno()); - ret = SOCKET_ERROR; - } - release_sock_fd( s, fd ); - - /* The wineserver may have swallowed the error before us */ - if (!ret && *(int*) optval == 0) - { - int i, events[FD_MAX_EVENTS]; - _get_sock_errors(s, events); - for (i = 0; i < FD_MAX_EVENTS; i++) - { - if(events[i]) - { - TRACE("returning SO_ERROR %d from wine server\n", events[i]); - *(int*) optval = events[i]; - break; - } - } - } - return ret; - } + return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_ERROR, optval, optlen ); case WS_SO_LINGER: { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7534e75edb3..9f461376853 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1295,7 +1295,6 @@ todo_wine SetLastError(0xdeadbeef); i = 4321; err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); -todo_wine ok( !err && !WSAGetLastError(), "got %d with %d (expected 0 with 0)\n", err, WSAGetLastError()); @@ -1306,7 +1305,6 @@ todo_wine SetLastError(0xdeadbeef); size = 1; err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); -todo_wine ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAEFAULT), "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError());

1 0

Zhiyi Zhang : light.msstyles: Add Button parts.
by Alexandre Julliard June 24, 2021

June 24, 2021

Module: wine Branch: master Commit: 991381046e9b3926ff9a217ea680e25df301d984 URL: https://source.winehq.org/git/wine.git/?a=commit;h=991381046e9b3926ff9a217e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 24 22:43:03 2021 +0800 light.msstyles: Add Button parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 13 ++ dlls/light.msstyles/blue_button.bmp | Bin 0 -> 12282 bytes dlls/light.msstyles/blue_button.svg | 24 ++++ dlls/light.msstyles/blue_checkbox_13px.bmp | Bin 0 -> 8250 bytes dlls/light.msstyles/blue_checkbox_13px.svg | 44 ++++++ dlls/light.msstyles/blue_checkbox_16px.bmp | Bin 0 -> 12426 bytes dlls/light.msstyles/blue_checkbox_16px.svg | 36 +++++ dlls/light.msstyles/blue_checkbox_25px.bmp | Bin 0 -> 30138 bytes dlls/light.msstyles/blue_checkbox_25px.svg | 40 ++++++ dlls/light.msstyles/blue_commandlink.bmp | Bin 0 -> 13074 bytes dlls/light.msstyles/blue_commandlink.svg | 18 +++ .../light.msstyles/blue_commandlink_glyph_30px.bmp | Bin 0 -> 18138 bytes .../light.msstyles/blue_commandlink_glyph_30px.svg | 19 +++ .../light.msstyles/blue_commandlink_glyph_45px.bmp | Bin 0 -> 40638 bytes .../light.msstyles/blue_commandlink_glyph_45px.svg | 19 +++ dlls/light.msstyles/blue_groupbox.bmp | Bin 0 -> 1898 bytes dlls/light.msstyles/blue_groupbox.svg | 15 +++ dlls/light.msstyles/blue_radiobutton_13px.bmp | Bin 0 -> 5546 bytes dlls/light.msstyles/blue_radiobutton_13px.svg | 28 ++++ dlls/light.msstyles/blue_radiobutton_16px.bmp | Bin 0 -> 8330 bytes dlls/light.msstyles/blue_radiobutton_16px.svg | 28 ++++ dlls/light.msstyles/blue_radiobutton_25px.bmp | Bin 0 -> 20138 bytes dlls/light.msstyles/blue_radiobutton_25px.svg | 28 ++++ dlls/light.msstyles/light.rc | 149 +++++++++++++++++++++ 24 files changed, 461 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=991381046e9b3926ff9a…

1 0

Rémi Bernon : d2d1: Use D3D11 interfaces in d2d_bitmap_create_shared.
by Alexandre Julliard June 24, 2021

June 24, 2021

Module: wine Branch: master Commit: af64b4c119921ede3fdea14391af88508b8af12f URL: https://source.winehq.org/git/wine.git/?a=commit;h=af64b4c119921ede3fdea143… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 24 09:35:31 2021 +0200 d2d1: Use D3D11 interfaces in d2d_bitmap_create_shared. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 0b5f3e6dc5a..03982924efa 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -414,7 +414,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, if (IsEqualGUID(iid, &IID_ID2D1Bitmap)) { struct d2d_bitmap *src_impl = unsafe_impl_from_ID2D1Bitmap(data); - ID3D10Device *device; + ID3D11Device *device; HRESULT hr = S_OK; if (src_impl->factory != context->factory) @@ -423,9 +423,9 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, goto failed; } - ID3D10Resource_GetDevice(src_impl->resource, &device); - ID3D10Device_Release(device); - if (device != context->d3d_device) + ID3D11Resource_GetDevice(src_impl->d3d11_resource, &device); + ID3D11Device_Release(device); + if (device != (ID3D11Device *)context->d3d11_device) { hr = D2DERR_UNSUPPORTED_OPERATION; goto failed; @@ -466,28 +466,37 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, { DXGI_SURFACE_DESC surface_desc; IDXGISurface *surface = data; - ID3D10Resource *resource; + ID3D11Resource *resource; + ID3D10Resource *d3d10_resource; D2D1_SIZE_U pixel_size; - ID3D10Device *device; + ID3D11Device *device; HRESULT hr; - if (FAILED(IDXGISurface_QueryInterface(surface, &IID_ID3D10Resource, (void **)&resource))) + if (FAILED(IDXGISurface_QueryInterface(surface, &IID_ID3D11Resource, (void **)&resource))) { WARN("Failed to get d3d resource from dxgi surface.\n"); return E_FAIL; } - ID3D10Resource_GetDevice(resource, &device); - ID3D10Device_Release(device); - if (device != context->d3d_device) + if (FAILED(hr = ID3D11Resource_QueryInterface(resource, &IID_ID3D10Resource, (void **)&d3d10_resource))) { - ID3D10Resource_Release(resource); + ERR("Failed to query ID3D10Resource interface, hr %#x.\n", hr); + ID3D11Resource_Release(resource); + return hr; + } + + ID3D11Resource_GetDevice(resource, &device); + ID3D11Resource_Release(resource); + ID3D11Device_Release(device); + if (device != (ID3D11Device *)context->d3d11_device) + { + ID3D10Resource_Release(d3d10_resource); return D2DERR_UNSUPPORTED_OPERATION; } if (!(*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { - ID3D10Resource_Release(resource); + ID3D10Resource_Release(d3d10_resource); return E_OUTOFMEMORY; } @@ -495,7 +504,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc))) { WARN("Failed to get surface desc, hr %#x.\n", hr); - ID3D10Resource_Release(resource); + ID3D10Resource_Release(d3d10_resource); return hr; } @@ -522,8 +531,8 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, pixel_size.width = surface_desc.Width; pixel_size.height = surface_desc.Height; - d2d_bitmap_init(*bitmap, context, resource, pixel_size, &d); - ID3D10Resource_Release(resource); + d2d_bitmap_init(*bitmap, context, d3d10_resource, pixel_size, &d); + ID3D10Resource_Release(d3d10_resource); TRACE("Created bitmap %p.\n", *bitmap); return S_OK;

1 0

Conor McCarthy : vkd3d-shader: Introduce struct vkd3d_shader_register_range.
by Alexandre Julliard June 24, 2021

June 24, 2021

Module: vkd3d Branch: master Commit: af2714832b174ff53e7a5df06d79e0e05f0f4794 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=af2714832b174ff53e7a5df… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 24 14:03:46 2021 +1000 vkd3d-shader: Introduce struct vkd3d_shader_register_range. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 25 +++++++++++++++---------- libs/vkd3d-shader/spirv.c | 8 ++++---- libs/vkd3d-shader/trace.c | 10 +++++----- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 9 +++++++-- 5 files changed, 33 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=af2714832b174ff53e7…

1 0

Conor McCarthy : vkd3d-shader: Store a vkd3d_shader_register_range structure in struct vkd3d_symbol_sampler_data.
by Alexandre Julliard June 24, 2021

June 24, 2021

Module: vkd3d Branch: master Commit: b38f94cfdcc1f9223b2cbdbf3e40df38ac03cdee URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b38f94cfdcc1f9223b2cbdb… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 24 14:03:50 2021 +1000 vkd3d-shader: Store a vkd3d_shader_register_range structure in struct vkd3d_symbol_sampler_data. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d647cab..aed15b9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1943,8 +1943,7 @@ struct vkd3d_symbol_resource_data struct vkd3d_symbol_sampler_data { - unsigned int register_space; - unsigned int register_index; + struct vkd3d_shader_register_range range; }; struct vkd3d_symbol @@ -5362,8 +5361,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com struct vkd3d_symbol reg_symbol; vkd3d_symbol_make_sampler(&reg_symbol, reg); - reg_symbol.info.sampler.register_space = sampler->range.space; - reg_symbol.info.sampler.register_index = sampler->range.first; + reg_symbol.info.sampler.range = sampler->range; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, NULL, sampler)) @@ -7617,8 +7615,8 @@ static const struct vkd3d_symbol *vkd3d_dxbc_compiler_find_combined_sampler(stru if (!(entry = rb_get(&compiler->symbol_table, &key))) return NULL; sampler_symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); - sampler_space = sampler_symbol->info.sampler.register_space; - sampler_index = sampler_symbol->info.sampler.register_index; + sampler_space = sampler_symbol->info.sampler.range.space; + sampler_index = sampler_symbol->info.sampler.range.first; } else {

1 0

Conor McCarthy : vkd3d: Remove fixme for UAV counter offsets.
by Alexandre Julliard June 24, 2021

June 24, 2021

Module: vkd3d Branch: master Commit: 67c002e7ca9bb6dba54eef51d7d5499a48a9461b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=67c002e7ca9bb6dba54eef5… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jun 23 22:32:20 2021 +1000 vkd3d: Remove fixme for UAV counter offsets. The fixme says the offset is ignored, but it is used when creating the Vulkan buffer view for the counter, and works as expected. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a9d4d46..3a66bb1 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2847,9 +2847,6 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ return; } - if (desc->u.Buffer.CounterOffsetInBytes) - FIXME("Ignoring counter offset %"PRIu64".\n", desc->u.Buffer.CounterOffsetInBytes); - flags = vkd3d_view_flags_from_d3d12_buffer_uav_flags(desc->u.Buffer.Flags); if (!vkd3d_create_buffer_view_for_resource(device, resource, desc->Format, desc->u.Buffer.FirstElement, desc->u.Buffer.NumElements,

1 0

Conor McCarthy : vkd3d-shader: Store a vkd3d_shader_register_range structure in struct vkd3d_shader_sampler.
by Alexandre Julliard June 24, 2021

June 24, 2021

Module: vkd3d Branch: master Commit: 1b716f8c28d13547d9338e67d1ffd5fdda34e6b0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1b716f8c28d13547d9338e6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 24 14:03:47 2021 +1000 vkd3d-shader: Store a vkd3d_shader_register_range structure in struct vkd3d_shader_sampler. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 4 ++-- libs/vkd3d-shader/spirv.c | 10 +++++----- libs/vkd3d-shader/trace.c | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 61acf77..cf83c1c 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -716,8 +716,8 @@ static void shader_sm4_read_dcl_sampler(struct vkd3d_shader_instruction *ins, if (ins->flags & ~VKD3D_SM4_SAMPLER_COMPARISON) FIXME("Unhandled sampler mode %#x.\n", ins->flags); shader_sm4_read_src_param(priv, &tokens, end, VKD3D_DATA_SAMPLER, &ins->declaration.sampler.src); - ins->declaration.sampler.register_index = shader_sm4_map_resource_idx(&ins->declaration.sampler.src.reg, priv); - shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.sampler.register_space); + ins->declaration.sampler.range.first = shader_sm4_map_resource_idx(&ins->declaration.sampler.src.reg, priv); + shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.sampler.range.space); } static void shader_sm4_read_dcl_index_range(struct vkd3d_shader_instruction *ins, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7a23d31..7935f12 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2443,8 +2443,8 @@ static bool vkd3d_dxbc_compiler_has_combined_sampler(const struct vkd3d_dxbc_com if ((!resource || (combined_sampler->resource_space == resource->range.space && combined_sampler->resource_index == resource->range.first)) - && (!sampler || (combined_sampler->sampler_space == sampler->register_space - && combined_sampler->sampler_index == sampler->register_index))) + && (!sampler || (combined_sampler->sampler_space == sampler->range.space + && combined_sampler->sampler_index == sampler->range.first))) return true; } @@ -5363,8 +5363,8 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com struct vkd3d_symbol reg_symbol; vkd3d_symbol_make_sampler(&reg_symbol, reg); - reg_symbol.info.sampler.register_space = sampler->register_space; - reg_symbol.info.sampler.register_index = sampler->register_index; + reg_symbol.info.sampler.register_space = sampler->range.space; + reg_symbol.info.sampler.register_index = sampler->range.first; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, NULL, sampler)) @@ -5376,7 +5376,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com ptr_type_id, storage_class, 0); vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, var_id, reg, - sampler->register_space, sampler->register_index, VKD3D_SHADER_RESOURCE_NONE, false); + sampler->range.space, sampler->range.first, VKD3D_SHADER_RESOURCE_NONE, false); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index c35179a..c51b2eb 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1546,7 +1546,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_dump_register(compiler, &ins->declaration.sampler.src.reg); if (ins->flags == VKD3DSI_SAMPLER_COMPARISON_MODE) shader_addline(buffer, ", comparisonMode"); - shader_dump_register_space(compiler, ins->declaration.sampler.register_space); + shader_dump_register_space(compiler, ins->declaration.sampler.range.space); break; case VKD3DSIH_DCL_TEMPS: diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index df811d3..e2c8d6f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -649,8 +649,8 @@ static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_conte flags = VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE; else flags = 0; - vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, sampler->register_space, - sampler->register_index, VKD3D_SHADER_RESOURCE_NONE, VKD3D_SHADER_RESOURCE_DATA_UINT, flags); + vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, sampler->range.space, + sampler->range.first, VKD3D_SHADER_RESOURCE_NONE, VKD3D_SHADER_RESOURCE_DATA_UINT, flags); } static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_context *context, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index cddb3d2..285f8cd 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -720,7 +720,7 @@ struct vkd3d_shader_register_semantic struct vkd3d_shader_sampler { struct vkd3d_shader_src_param src; - unsigned int register_space, register_index; + struct vkd3d_shader_register_range range; }; struct vkd3d_shader_constant_buffer

1 0

Conor McCarthy : vkd3d-shader: Store a vkd3d_shader_register_range structure in struct vkd3d_symbol_resource_data.
by Alexandre Julliard June 24, 2021

June 24, 2021

Module: vkd3d Branch: master Commit: 0c04c1777a2ee1fc8f94e0ee54fcb831a1a6632b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0c04c1777a2ee1fc8f94e0e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 24 14:03:49 2021 +1000 vkd3d-shader: Store a vkd3d_shader_register_range structure in struct vkd3d_symbol_resource_data. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ce819eb..d647cab 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1932,8 +1932,7 @@ struct vkd3d_symbol_register_data struct vkd3d_symbol_resource_data { - unsigned int register_space; - unsigned int register_index; + struct vkd3d_shader_register_range range; enum vkd3d_shader_component_type sampled_type; uint32_t type_id; const struct vkd3d_spirv_resource_type *resource_type_info; @@ -5533,8 +5532,8 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ current->sampler_index == VKD3D_SHADER_DUMMY_SAMPLER_INDEX ? 0 : current->sampler_space, current->sampler_index); symbol.id = var_id; - symbol.info.resource.register_space = resource_space; - symbol.info.resource.register_index = resource_index; + symbol.info.resource.range.space = resource_space; + symbol.info.resource.range.first = resource_index; symbol.info.resource.sampled_type = sampled_type; symbol.info.resource.type_id = image_type_id; symbol.info.resource.resource_type_info = resource_type_info; @@ -5657,8 +5656,7 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp vkd3d_symbol_make_resource(&resource_symbol, reg); resource_symbol.id = var_id; - resource_symbol.info.resource.register_space = register_space; - resource_symbol.info.resource.register_index = register_index; + resource_symbol.info.resource.range = resource->range; resource_symbol.info.resource.sampled_type = sampled_type; resource_symbol.info.resource.type_id = type_id; resource_symbol.info.resource.resource_type_info = resource_type_info; @@ -7673,7 +7671,7 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil image->image_type_id, image->id, SpvMemoryAccessMaskNone) : 0; image->image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, resource_reg, - symbol->info.resource.register_space, symbol->info.resource.register_index, image->resource_type_info, + symbol->info.resource.range.space, symbol->info.resource.range.first, image->resource_type_info, image->sampled_type, image->structure_stride || image->raw, depth_comparison); if (sampled)

1 0

Conor McCarthy : tests: Add offset tests to test_uav_counters().
by Alexandre Julliard June 24, 2021

June 24, 2021

Module: vkd3d Branch: master Commit: 20e0a241b4472541a95590d42e7736857fee9032 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=20e0a241b4472541a95590d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 24 15:32:42 2021 +1000 tests: Add offset tests to test_uav_counters(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 226 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 123 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=20e0a241b4472541a95…

1 0

Conor McCarthy : vkd3d-shader: Store a vkd3d_shader_register_range structure in struct vkd3d_shader_constant_buffer.
by Alexandre Julliard June 24, 2021

June 24, 2021

Module: vkd3d Branch: master Commit: 533d901a24fd4fc990fe85553e260d3053e99406 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=533d901a24fd4fc990fe855… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 24 14:03:48 2021 +1000 vkd3d-shader: Store a vkd3d_shader_register_range structure in struct vkd3d_shader_constant_buffer. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 6 +++--- libs/vkd3d-shader/spirv.c | 6 +++--- libs/vkd3d-shader/trace.c | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index cf83c1c..70ab70a 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -686,12 +686,12 @@ static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction const DWORD *end = &tokens[token_count]; shader_sm4_read_src_param(priv, &tokens, end, VKD3D_DATA_FLOAT, &ins->declaration.cb.src); - ins->declaration.cb.register_index = shader_sm4_map_resource_idx(&ins->declaration.cb.src.reg, priv); + ins->declaration.cb.range.first = shader_sm4_map_resource_idx(&ins->declaration.cb.src.reg, priv); if (opcode_token & VKD3D_SM4_INDEX_TYPE_MASK) ins->flags |= VKD3DSI_INDEXED_DYNAMIC; ins->declaration.cb.size = ins->declaration.cb.src.reg.idx[2].offset; - ins->declaration.cb.register_space = 0; + ins->declaration.cb.range.space = 0; if (shader_is_sm_5_1(priv)) { @@ -702,7 +702,7 @@ static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction } ins->declaration.cb.size = *tokens++; - shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.cb.register_space); + shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.cb.range.space); } } diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7935f12..ce819eb 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2403,8 +2403,8 @@ static bool vkd3d_dxbc_compiler_check_shader_visibility(const struct vkd3d_dxbc_ static struct vkd3d_push_constant_buffer_binding *vkd3d_dxbc_compiler_find_push_constant_buffer( const struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_constant_buffer *cb) { - unsigned int register_space = cb->register_space; - unsigned int reg_idx = cb->register_index; + unsigned int register_space = cb->range.space; + unsigned int reg_idx = cb->range.first; unsigned int i; for (i = 0; i < compiler->shader_interface.push_constant_buffer_count; ++i) @@ -5309,7 +5309,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_constant_buffer(struct vkd3d_dxbc_compi pointer_type_id, storage_class, 0); vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, - var_id, reg, cb->register_space, cb->register_index, VKD3D_SHADER_RESOURCE_BUFFER, false); + var_id, reg, cb->range.space, cb->range.first, VKD3D_SHADER_RESOURCE_BUFFER, false); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index c51b2eb..2d16714 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1438,7 +1438,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_print_subscript(compiler, ins->declaration.cb.size, NULL); shader_addline(buffer, ", %s", ins->flags & VKD3DSI_INDEXED_DYNAMIC ? "dynamicIndexed" : "immediateIndexed"); - shader_dump_register_space(compiler, ins->declaration.cb.register_space); + shader_dump_register_space(compiler, ins->declaration.cb.range.space); break; case VKD3DSIH_DCL_FUNCTION_BODY: diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index e2c8d6f..a8dc3bf 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -632,8 +632,8 @@ static void vkd3d_shader_scan_constant_buffer_declaration(struct vkd3d_shader_sc if (!context->scan_descriptor_info) return; - vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, cb->register_space, - cb->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0); + vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, cb->range.space, + cb->range.first, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0); } static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_context *context, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 285f8cd..5affbae 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -727,7 +727,7 @@ struct vkd3d_shader_constant_buffer { struct vkd3d_shader_src_param src; unsigned int size; - unsigned int register_space, register_index; + struct vkd3d_shader_register_range range; }; struct vkd3d_shader_structured_resource

1 0