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

Jacek Caban : combase: Add CoDecodeProxy stub.
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: wine Branch: master Commit: a2f6ddeedd868f403d7746098092aae8e423d9b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2f6ddeedd868f403d774609… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 28 20:27:25 2021 +0200 combase: Add CoDecodeProxy stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 2 +- dlls/combase/rpc.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 0437714edcc..7343da6a0ef 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -85,7 +85,7 @@ @ stdcall CoCreateInstanceFromApp(ptr ptr long ptr long ptr) @ stub CoCreateObjectInContext @ stub CoDeactivateObject -@ stub CoDecodeProxy +@ stdcall CoDecodeProxy(long int64 ptr) @ stdcall CoDecrementMTAUsage(ptr) @ stdcall CoDisableCallCancellation(ptr) @ stub CoDisconnectContext diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index 55450ad7f14..7337498e9fa 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -2109,3 +2109,12 @@ BOOL WINAPI DllDebugObjectRPCHook(BOOL trace, /* ORPC_INIT_ARGS * */ void *args) return TRUE; } + +/****************************************************************************** + * CoDecodeProxy (combase.@) + */ +HRESULT WINAPI CoDecodeProxy(DWORD client_pid, UINT64 proxy_addr, ServerInformation *server_info) +{ + FIXME("%x %s %p\n", client_pid, wine_dbgstr_longlong(proxy_addr), server_info); + return E_NOTIMPL; +}

1 0

Zebediah Figura : ws2_32: Move the getsockopt(IPV6_MULTICAST_IF) implementation to ntdll.
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: wine Branch: master Commit: 15b3ab9b5ba1201df2d233f6fb7d8989f76ed94d URL: https://source.winehq.org/git/wine.git/?a=commit;h=15b3ab9b5ba1201df2d233f6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 16:18:10 2021 -0500 ws2_32: Move the getsockopt(IPV6_MULTICAST_IF) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 2 ++ include/wine/afd.h | 1 + 3 files changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 12a6ef418ba..f0876c4c13a 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1870,6 +1870,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS: return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, in_buffer, in_size ); + case IOCTL_AFD_WINE_GET_IPV6_MULTICAST_IF: + return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_IF, out_buffer, out_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 902f9e07b48..e41c5983e48 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2416,6 +2416,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS, optval, optlen ); case WS_IPV6_MULTICAST_IF: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_IF, optval, optlen ); + case WS_IPV6_MULTICAST_LOOP: case WS_IPV6_UNICAST_HOPS: case WS_IPV6_V6ONLY: diff --git a/include/wine/afd.h b/include/wine/afd.h index 2c0f1a1e23c..30753cb93ab 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -213,6 +213,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP WINE_AFD_IOC(268) #define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS WINE_AFD_IOC(269) #define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS WINE_AFD_IOC(270) +#define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_IF WINE_AFD_IOC(271) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the getsockopt(IPV6_MULTICAST_LOOP) implementation to ntdll.
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: wine Branch: master Commit: aab6e604a904bc4518f8d964b34151f3e3d4a37a URL: https://source.winehq.org/git/wine.git/?a=commit;h=aab6e604a904bc4518f8d964… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 16:18:12 2021 -0500 ws2_32: Move the getsockopt(IPV6_MULTICAST_LOOP) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 2 ++ include/wine/afd.h | 1 + 3 files changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 123b5323674..14bdaed19f7 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1876,6 +1876,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF: return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_IF, in_buffer, in_size ); + case IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP: + return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, out_buffer, out_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8548e7bf3a7..432f3a26f30 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2419,6 +2419,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_IF, optval, optlen ); case WS_IPV6_MULTICAST_LOOP: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP, optval, optlen ); + case WS_IPV6_UNICAST_HOPS: case WS_IPV6_V6ONLY: #ifdef IPV6_UNICAST_IF diff --git a/include/wine/afd.h b/include/wine/afd.h index 284e8f55bc4..3d4dcf539cd 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -215,6 +215,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS WINE_AFD_IOC(270) #define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_IF WINE_AFD_IOC(271) #define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF WINE_AFD_IOC(272) +#define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP WINE_AFD_IOC(273) struct afd_create_params {

1 0

Jacek Caban : include: Introduce combaseapi.h.
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: wine Branch: master Commit: 448317dca654c6146b3c10c95ee6f1a6b7bf5dcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=448317dca654c6146b3c10c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 28 20:27:11 2021 +0200 include: Introduce combaseapi.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/combaseapi.h | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/objbase.h | 11 +---------- 3 files changed, 55 insertions(+), 10 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 46cb0f53a5e..9b397ffa183 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -74,6 +74,7 @@ SOURCES = \ colinf.idl \ colordlg.h \ colrst.idl \ + combaseapi.h \ comcat.idl \ commctrl.h \ commctrl.rh \ diff --git a/include/combaseapi.h b/include/combaseapi.h new file mode 100644 index 00000000000..4b8cb457328 --- /dev/null +++ b/include/combaseapi.h @@ -0,0 +1,53 @@ +/* + * Copyright 2021 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <rpc.h> +#include <rpcndr.h> + +#ifndef _COMBASEAPI_H_ +#define _COMBASEAPI_H_ + +#ifndef RC_INVOKED +#include <stdlib.h> +#endif + +#include <objidlbase.h> +#include <guiddef.h> + +#ifndef INITGUID +#include <cguid.h> +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct tagServerInformation +{ + DWORD dwServerPid; + DWORD dwServerTid; + UINT64 ui64ServerAddress; +} ServerInformation, *PServerInformation; + +HRESULT WINAPI CoDecodeProxy(DWORD client_pid, UINT64 proxy_addr, ServerInformation *server_info); + +#ifdef __cplusplus +} +#endif + +#endif /* _COMBASEAPI_H_ */ diff --git a/include/objbase.h b/include/objbase.h index 714d56f2f16..8bf6ad9da84 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -256,20 +256,11 @@ typedef interface IRpcStubBuffer IRpcStubBuffer; typedef interface IRpcChannelBuffer IRpcChannelBuffer; #endif -#ifndef RC_INVOKED -/* For compatibility only, at least for now */ -#include <stdlib.h> -#endif - +#include <combaseapi.h> #include <wtypes.h> #include <unknwn.h> #include <objidl.h> -#include <guiddef.h> -#ifndef INITGUID -#include <cguid.h> -#endif - #ifdef __cplusplus extern "C" { #endif

1 0

Zebediah Figura : ws2_32: Move the setsockopt(IPV6_MULTICAST_LOOP) implementation to ntdll.
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: wine Branch: master Commit: 15bc605224fe0c0d9efc9e271ee2b3195fc77f48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15bc605224fe0c0d9efc9e27… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 16:18:13 2021 -0500 ws2_32: Move the setsockopt(IPV6_MULTICAST_LOOP) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 2 ++ include/wine/afd.h | 1 + 3 files changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 14bdaed19f7..e9239bd7bb9 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1879,6 +1879,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP: return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, out_buffer, out_size ); + case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP: + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, in_buffer, in_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 432f3a26f30..1f8020b5c3e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3638,6 +3638,8 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF, optval, optlen ); case WS_IPV6_MULTICAST_LOOP: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP, optval, optlen ); + case WS_IPV6_UNICAST_HOPS: #ifdef IPV6_UNICAST_IF case WS_IPV6_UNICAST_IF: diff --git a/include/wine/afd.h b/include/wine/afd.h index 3d4dcf539cd..6c84b72c028 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -216,6 +216,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_IF WINE_AFD_IOC(271) #define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF WINE_AFD_IOC(272) #define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP WINE_AFD_IOC(273) +#define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP WINE_AFD_IOC(274) struct afd_create_params {

1 0

Conor McCarthy : vkd3d-shader: Handle descriptor array dynamic indexing.
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: vkd3d Branch: master Commit: be8f51666ec1686ac0be5c3b0531e6b59d868f9d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=be8f51666ec1686ac0be5c3… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jul 28 23:59:43 2021 +1000 vkd3d-shader: Handle descriptor array dynamic indexing. 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> --- include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 63 +++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 57 insertions(+), 7 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 6cdbaf1..b0412d3 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -573,6 +573,7 @@ enum vkd3d_shader_spirv_extension { VKD3D_SHADER_SPIRV_EXTENSION_NONE, VKD3D_SHADER_SPIRV_EXTENSION_EXT_DEMOTE_TO_HELPER_INVOCATION, + VKD3D_SHADER_SPIRV_EXTENSION_EXT_DESCRIPTOR_INDEXING, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SPIRV_EXTENSION), }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4c870fb..d299e6e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1822,6 +1822,13 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, vkd3d_spirv_build_op_extension(&stream, "SPV_KHR_shader_draw_parameters"); if (vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityDemoteToHelperInvocationEXT)) vkd3d_spirv_build_op_extension(&stream, "SPV_EXT_demote_to_helper_invocation"); + if (vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityUniformBufferArrayDynamicIndexing) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityUniformTexelBufferArrayDynamicIndexingEXT) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilitySampledImageArrayDynamicIndexing) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageBufferArrayDynamicIndexing) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageTexelBufferArrayDynamicIndexingEXT) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageImageArrayDynamicIndexing)) + vkd3d_spirv_build_op_extension(&stream, "SPV_EXT_descriptor_indexing"); if (builder->ext_instr_set_glsl_450) vkd3d_spirv_build_op_ext_inst_import(&stream, builder->ext_instr_set_glsl_450, "GLSL.std.450"); @@ -3126,18 +3133,59 @@ static bool register_is_descriptor(const struct vkd3d_shader_register *reg) } } +static bool vkd3d_dxbc_compiler_enable_descriptor_indexing(struct vkd3d_dxbc_compiler *compiler, + enum vkd3d_shader_register_type reg_type, enum vkd3d_shader_resource_type resource_type) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + if (!vkd3d_dxbc_compiler_is_target_extension_supported(compiler, + VKD3D_SHADER_SPIRV_EXTENSION_EXT_DESCRIPTOR_INDEXING)) + return false; + + switch (reg_type) + { + case VKD3DSPR_CONSTBUFFER: + vkd3d_spirv_enable_capability(builder, SpvCapabilityUniformBufferArrayDynamicIndexing); + break; + case VKD3DSPR_RESOURCE: + vkd3d_spirv_enable_capability(builder, resource_type == VKD3D_SHADER_RESOURCE_BUFFER + ? SpvCapabilityUniformTexelBufferArrayDynamicIndexingEXT + : SpvCapabilitySampledImageArrayDynamicIndexing); + break; + case VKD3DSPR_UAV: + if (resource_type == VKD3D_SHADER_RESOURCE_BUFFER) + vkd3d_spirv_enable_capability(builder, compiler->ssbo_uavs + ? SpvCapabilityStorageBufferArrayDynamicIndexing + : SpvCapabilityStorageTexelBufferArrayDynamicIndexingEXT); + else + vkd3d_spirv_enable_capability(builder, SpvCapabilityStorageImageArrayDynamicIndexing); + break; + case VKD3DSPR_SAMPLER: + break; + default: + ERR("Unhandled register type %#x.\n", reg_type); + break; + } + + return true; +} + static uint32_t vkd3d_dxbc_compiler_get_descriptor_index(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *reg, unsigned int binding_base_idx) + const struct vkd3d_shader_register *reg, unsigned int binding_base_idx, + enum vkd3d_shader_resource_type resource_type) { struct vkd3d_shader_register_index index = reg->idx[1]; uint32_t index_id; if (index.rel_addr) { - FIXME("Descriptor dynamic indexing is not supported.\n"); - vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_IDX_UNSUPPORTED, - "Cannot dynamically index a descriptor array of type %#x, id %u. " - "Dynamic indexing is not supported.", reg->type, reg->idx[0].offset); + if (!vkd3d_dxbc_compiler_enable_descriptor_indexing(compiler, reg->type, resource_type)) + { + FIXME("The target environment does not support descriptor indexing.\n"); + vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_IDX_UNSUPPORTED, + "Cannot dynamically index a descriptor array of type %#x, id %u. " + "The target environment does not support descriptor indexing.", reg->type, reg->idx[0].offset); + } } index.offset -= binding_base_idx; @@ -3159,7 +3207,8 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp assert(!reg->idx[0].rel_addr); if (register_info->descriptor_array) indexes[index_count++] = vkd3d_dxbc_compiler_get_descriptor_index(compiler, reg, - register_info->descriptor_array->info.descriptor_array.binding_base_idx); + register_info->descriptor_array->info.descriptor_array.binding_base_idx, + VKD3D_SHADER_RESOURCE_BUFFER); indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, register_info->member_idx); indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[2]); } @@ -7821,7 +7870,7 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil uint32_t ptr_type_id, index_id; index_id = vkd3d_dxbc_compiler_get_descriptor_index(compiler, resource_reg, - array_data->binding_base_idx); + array_data->binding_base_idx, symbol->info.resource.resource_type_info->resource_type); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, array_data->storage_class, array_data->contained_type_id);

1 0

Zebediah Figura : vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_static_samplers().
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: vkd3d Branch: master Commit: dda2c4839db68c621e94503aec7c7818b34542db URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dda2c4839db68c621e94503… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 18:59:12 2021 -0500 vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_static_samplers(). Signed-off-by: Zebediah Figura <zfigura(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 | 57 ++++++++++++++---------------------------------- 1 file changed, 16 insertions(+), 41 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 8cd6e56..ed84e26 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2956,12 +2956,6 @@ static bool write_dword(struct root_signature_writer_context *context, DWORD d) return write_dwords(context, 1, d); } -static bool write_float(struct root_signature_writer_context *context, float f) -{ - put_f32(&context->buffer, f); - return !context->buffer.status; -} - static size_t get_chunk_offset(struct root_signature_writer_context *context) { return bytecode_get_size(&context->buffer) - context->chunk_position; @@ -3115,7 +3109,7 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co return VKD3D_OK; } -static int shader_write_static_samplers(struct root_signature_writer_context *context, +static void shader_write_static_samplers(struct vkd3d_bytecode_buffer *buffer, const struct vkd3d_shader_versioned_root_signature_desc *desc) { const struct vkd3d_shader_static_sampler_desc *samplers = versioned_root_signature_get_static_samplers(desc); @@ -3123,40 +3117,20 @@ static int shader_write_static_samplers(struct root_signature_writer_context *co for (i = 0; i < versioned_root_signature_get_static_sampler_count(desc); ++i) { - if (!write_dword(context, samplers[i].filter)) - goto fail; - if (!write_dword(context, samplers[i].address_u)) - goto fail; - if (!write_dword(context, samplers[i].address_v)) - goto fail; - if (!write_dword(context, samplers[i].address_w)) - goto fail; - if (!write_float(context, samplers[i].mip_lod_bias)) - goto fail; - if (!write_dword(context, samplers[i].max_anisotropy)) - goto fail; - if (!write_dword(context, samplers[i].comparison_func)) - goto fail; - if (!write_dword(context, samplers[i].border_colour)) - goto fail; - if (!write_float(context, samplers[i].min_lod)) - goto fail; - if (!write_float(context, samplers[i].max_lod)) - goto fail; - if (!write_dword(context, samplers[i].shader_register)) - goto fail; - if (!write_dword(context, samplers[i].register_space)) - goto fail; - if (!write_dword(context, samplers[i].shader_visibility)) - goto fail; + put_u32(buffer, samplers[i].filter); + put_u32(buffer, samplers[i].address_u); + put_u32(buffer, samplers[i].address_v); + put_u32(buffer, samplers[i].address_w); + put_f32(buffer, samplers[i].mip_lod_bias); + put_u32(buffer, samplers[i].max_anisotropy); + put_u32(buffer, samplers[i].comparison_func); + put_u32(buffer, samplers[i].border_colour); + put_f32(buffer, samplers[i].min_lod); + put_f32(buffer, samplers[i].max_lod); + put_u32(buffer, samplers[i].shader_register); + put_u32(buffer, samplers[i].register_space); + put_u32(buffer, samplers[i].shader_visibility); } - - return VKD3D_OK; - -fail: - vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, - "Out of memory while writing root signature static samplers."); - return VKD3D_ERROR_OUT_OF_MEMORY; } static int shader_write_root_signature(struct root_signature_writer_context *context, @@ -3187,7 +3161,8 @@ static int shader_write_root_signature(struct root_signature_writer_context *con return ret; set_u32(buffer, samplers_offset_position, get_chunk_offset(context)); - return shader_write_static_samplers(context, desc); + shader_write_static_samplers(buffer, desc); + return 0; fail: vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY,

1 0

Zebediah Figura : vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_parameters().
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: vkd3d Branch: master Commit: bd88613c3e3c2d57cbaf5a584338cff8ebb6c744 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bd88613c3e3c2d57cbaf5a5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 18:59:11 2021 -0500 vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_parameters(). Signed-off-by: Zebediah Figura <zfigura(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 | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 67844d5..8cd6e56 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -3075,12 +3075,9 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co parameters_position = bytecode_get_size(buffer); for (i = 0; i < parameter_count; ++i) { - if (!write_dword(context, versioned_root_signature_get_parameter_type(desc, i))) - goto fail; - if (!write_dword(context, versioned_root_signature_get_parameter_shader_visibility(desc, i))) - goto fail; - if (!write_dword(context, 0xffffffff)) /* offset */ - goto fail; + put_u32(buffer, versioned_root_signature_get_parameter_type(desc, i)); + put_u32(buffer, versioned_root_signature_get_parameter_shader_visibility(desc, i)); + put_u32(buffer, 0xffffffff); /* offset */ } for (i = 0; i < parameter_count; ++i) @@ -3116,11 +3113,6 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co } return VKD3D_OK; - -fail: - vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, - "Out of memory while writing root signature root parameters."); - return VKD3D_ERROR_OUT_OF_MEMORY; } static int shader_write_static_samplers(struct root_signature_writer_context *context,

1 0

Zebediah Figura : vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_descriptor1().
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: vkd3d Branch: master Commit: e285eb2d237f9af57127e127f5b2b93245fb2198 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e285eb2d237f9af57127e12… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 18:59:10 2021 -0500 vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_descriptor1(). Signed-off-by: Zebediah Figura <zfigura(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 | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index d8c9f44..67844d5 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -3056,22 +3056,12 @@ static void shader_write_root_descriptor(struct vkd3d_bytecode_buffer *buffer, put_u32(buffer, descriptor->register_space); } -static int shader_write_root_descriptor1(struct root_signature_writer_context *context, +static void shader_write_root_descriptor1(struct vkd3d_bytecode_buffer *buffer, const struct vkd3d_shader_root_descriptor1 *descriptor) { - if (!write_dword(context, descriptor->shader_register)) - goto fail; - if (!write_dword(context, descriptor->register_space)) - goto fail; - if (!write_dword(context, descriptor->flags)) - goto fail; - - return VKD3D_OK; - -fail: - vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, - "Out of memory while writing root signature root descriptor."); - return VKD3D_ERROR_OUT_OF_MEMORY; + put_u32(buffer, descriptor->shader_register); + put_u32(buffer, descriptor->register_space); + put_u32(buffer, descriptor->flags); } static int shader_write_root_parameters(struct root_signature_writer_context *context, @@ -3081,7 +3071,6 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co struct vkd3d_bytecode_buffer *buffer = &context->buffer; size_t parameters_position; unsigned int i; - int ret; parameters_position = bytecode_get_size(buffer); for (i = 0; i < parameter_count; ++i) @@ -3096,8 +3085,6 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co for (i = 0; i < parameter_count; ++i) { - ret = VKD3D_OK; - set_u32(buffer, parameters_position + ((3 * i + 2) * sizeof(uint32_t)), get_chunk_offset(context)); switch (versioned_root_signature_get_parameter_type(desc, i)) @@ -3117,7 +3104,7 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co if (desc->version == VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0) shader_write_root_descriptor(buffer, &desc->u.v_1_0.parameters[i].u.descriptor); else - ret = shader_write_root_descriptor1(context, &desc->u.v_1_1.parameters[i].u.descriptor); + shader_write_root_descriptor1(buffer, &desc->u.v_1_1.parameters[i].u.descriptor); break; default: FIXME("Unrecognized type %#x.\n", versioned_root_signature_get_parameter_type(desc, i)); @@ -3126,9 +3113,6 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co versioned_root_signature_get_parameter_type(desc, i)); return VKD3D_ERROR_INVALID_ARGUMENT; } - - if (ret < 0) - return ret; } return VKD3D_OK;

1 0

Zebediah Figura : vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_constants().
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: vkd3d Branch: master Commit: c95d028ee2254417ca7008ba438167714506ff82 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c95d028ee2254417ca7008b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 18:59:08 2021 -0500 vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_constants(). Signed-off-by: Zebediah Figura <zfigura(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 | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 0bb2287..4fb26b8 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -3041,22 +3041,12 @@ static void shader_write_descriptor_table1(struct root_signature_writer_context shader_write_descriptor_ranges1(buffer, table); } -static int shader_write_root_constants(struct root_signature_writer_context *context, +static void shader_write_root_constants(struct vkd3d_bytecode_buffer *buffer, const struct vkd3d_shader_root_constants *constants) { - if (!write_dword(context, constants->shader_register)) - goto fail; - if (!write_dword(context, constants->register_space)) - goto fail; - if (!write_dword(context, constants->value_count)) - goto fail; - - return VKD3D_OK; - -fail: - vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, - "Out of memory while writing root signature root constants."); - return VKD3D_ERROR_OUT_OF_MEMORY; + put_u32(buffer, constants->shader_register); + put_u32(buffer, constants->register_space); + put_u32(buffer, constants->value_count); } static int shader_write_root_descriptor(struct root_signature_writer_context *context, @@ -3128,7 +3118,7 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co shader_write_descriptor_table1(context, &desc->u.v_1_1.parameters[i].u.descriptor_table); break; case VKD3D_SHADER_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: - ret = shader_write_root_constants(context, versioned_root_signature_get_root_constants(desc, i)); + shader_write_root_constants(buffer, versioned_root_signature_get_root_constants(desc, i)); break; case VKD3D_SHADER_ROOT_PARAMETER_TYPE_CBV: case VKD3D_SHADER_ROOT_PARAMETER_TYPE_SRV:

1 0