wine-commits October 2018

wine-commits@winehq.org

1 participants
602 discussions

Józef Kucia : vkd3d-shader: Generalize helper for emitting descriptor binding decorations.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: vkd3d Branch: master Commit: f24292258711b5b8b22e256ce989ef11d9ddfaf9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f24292258711b5b8b22e256… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 22 01:49:13 2018 +0200 vkd3d-shader: Generalize helper for emitting descriptor binding decorations. Signed-off-by: Józef Kucia <jkucia(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 | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 33be8de..93a549c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2015,7 +2015,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor { const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; enum vkd3d_shader_descriptor_type descriptor_type; - struct vkd3d_shader_descriptor_binding vk_binding; + struct vkd3d_shader_descriptor_binding binding; unsigned int reg_idx = reg->idx[0].offset; bool is_buffer_resource; unsigned int i; @@ -2068,21 +2068,28 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor descriptor_type, reg_idx, compiler->shader_type); } - vk_binding.set = 0; - vk_binding.binding = compiler->binding_idx++; - return vk_binding; + binding.set = 0; + binding.binding = compiler->binding_idx++; + return binding; } static void vkd3d_dxbc_compiler_emit_descriptor_binding(struct vkd3d_dxbc_compiler *compiler, + uint32_t variable_id, const struct vkd3d_shader_descriptor_binding *binding) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + vkd3d_spirv_build_op_decorate1(builder, variable_id, SpvDecorationDescriptorSet, binding->set); + vkd3d_spirv_build_op_decorate1(builder, variable_id, SpvDecorationBinding, binding->binding); +} + +static void vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(struct vkd3d_dxbc_compiler *compiler, uint32_t variable_id, const struct vkd3d_shader_register *reg, enum vkd3d_shader_resource_type resource_type, bool is_uav_counter) { - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - struct vkd3d_shader_descriptor_binding vk_binding; + struct vkd3d_shader_descriptor_binding binding; - vk_binding = vkd3d_dxbc_compiler_get_descriptor_binding(compiler, reg, resource_type, is_uav_counter); - vkd3d_spirv_build_op_decorate1(builder, variable_id, SpvDecorationDescriptorSet, vk_binding.set); - vkd3d_spirv_build_op_decorate1(builder, variable_id, SpvDecorationBinding, vk_binding.binding); + binding = vkd3d_dxbc_compiler_get_descriptor_binding(compiler, reg, resource_type, is_uav_counter); + vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, variable_id, &binding); } static void vkd3d_dxbc_compiler_put_symbol(struct vkd3d_dxbc_compiler *compiler, @@ -3688,7 +3695,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_constant_buffer(struct vkd3d_dxbc_compi var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, pointer_type_id, storage_class, 0); - vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, + vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, var_id, reg, VKD3D_SHADER_RESOURCE_BUFFER, false); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -3751,7 +3758,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, ptr_type_id, storage_class, 0); - vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, + vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, var_id, reg, VKD3D_SHADER_RESOURCE_NONE, false); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -3874,7 +3881,7 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, ptr_type_id, storage_class, 0); - vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, var_id, reg, resource_type, false); + vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, var_id, reg, resource_type, false); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -3896,7 +3903,7 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp counter_var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, ptr_type_id, storage_class, 0); - vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, + vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, counter_var_id, reg, resource_type, true); vkd3d_spirv_build_op_name(builder, counter_var_id, "u%u_counter", reg->idx[0].offset);

1 0

Józef Kucia : vkd3d-shader: Remove sampler_id from struct vkd3d_shader_image.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: vkd3d Branch: master Commit: 3efa365b5ed3d9f122be44bf886e3f6ed261fd98 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3efa365b5ed3d9f122be44b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 22 01:49:12 2018 +0200 vkd3d-shader: Remove sampler_id from struct vkd3d_shader_image. Signed-off-by: Józef Kucia <jkucia(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 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8508741..33be8de 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5317,7 +5317,6 @@ struct vkd3d_shader_image { uint32_t id; uint32_t image_id; - uint32_t sampler_id; uint32_t sampled_image_id; enum vkd3d_component_type sampled_type; @@ -5370,7 +5369,6 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil resource_reg, image->resource_type_info, image->sampled_type, image->structure_stride || image->raw, depth_comparison); - image->sampler_id = 0; image->sampled_image_id = 0; } @@ -5379,14 +5377,14 @@ static void vkd3d_dxbc_compiler_prepare_sampled_image_for_sampler(struct vkd3d_d uint32_t sampler_var_id, unsigned int flags) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t sampled_image_type_id; + uint32_t sampler_id, sampled_image_type_id; vkd3d_dxbc_compiler_prepare_image(compiler, image, resource_reg, flags); - image->sampler_id = vkd3d_spirv_build_op_load(builder, + sampler_id = vkd3d_spirv_build_op_load(builder, vkd3d_spirv_get_op_type_sampler(builder), sampler_var_id, SpvMemoryAccessMaskNone); sampled_image_type_id = vkd3d_spirv_get_op_type_sampled_image(builder, image->image_type_id); image->sampled_image_id = vkd3d_spirv_build_op_sampled_image(builder, - sampled_image_type_id, image->image_id, image->sampler_id); + sampled_image_type_id, image->image_id, sampler_id); } static void vkd3d_dxbc_compiler_prepare_dummy_sampled_image(struct vkd3d_dxbc_compiler *compiler,

1 0

Michael Stefaniuc : rpcrt4: Use the standard ARRAY_SIZE() macro.
by Alexandre Julliard 19 Oct '18

19 Oct '18

Module: wine Branch: master Commit: 377243b41105085ed23407eb2a03b54737d59f64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=377243b41105085ed23407eb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Oct 19 22:11:35 2018 +0200 rpcrt4: Use the standard ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index ffe8b77..b98bf9e 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -54,8 +54,6 @@ #define DEFAULT_NCACN_HTTP_TIMEOUT (60 * 1000) -#define ARRAYSIZE(a) (sizeof((a)) / sizeof((a)[0])) - WINE_DEFAULT_DEBUG_CHANNEL(rpc); static RpcConnection *rpcrt4_spawn_connection(RpcConnection *old_connection); @@ -2397,11 +2395,11 @@ static const struct } auth_schemes[] = { - { basicW, ARRAYSIZE(basicW) - 1, RPC_C_HTTP_AUTHN_SCHEME_BASIC }, - { ntlmW, ARRAYSIZE(ntlmW) - 1, RPC_C_HTTP_AUTHN_SCHEME_NTLM }, - { passportW, ARRAYSIZE(passportW) - 1, RPC_C_HTTP_AUTHN_SCHEME_PASSPORT }, - { digestW, ARRAYSIZE(digestW) - 1, RPC_C_HTTP_AUTHN_SCHEME_DIGEST }, - { negotiateW, ARRAYSIZE(negotiateW) - 1, RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE } + { basicW, ARRAY_SIZE(basicW) - 1, RPC_C_HTTP_AUTHN_SCHEME_BASIC }, + { ntlmW, ARRAY_SIZE(ntlmW) - 1, RPC_C_HTTP_AUTHN_SCHEME_NTLM }, + { passportW, ARRAY_SIZE(passportW) - 1, RPC_C_HTTP_AUTHN_SCHEME_PASSPORT }, + { digestW, ARRAY_SIZE(digestW) - 1, RPC_C_HTTP_AUTHN_SCHEME_DIGEST }, + { negotiateW, ARRAY_SIZE(negotiateW) - 1, RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE } }; static DWORD auth_scheme_from_header( const WCHAR *header ) @@ -3260,7 +3258,7 @@ static const struct protseq_ops protseq_list[] = const struct protseq_ops *rpcrt4_get_protseq_ops(const char *protseq) { unsigned int i; - for(i=0; i<ARRAYSIZE(protseq_list); i++) + for(i = 0; i < ARRAY_SIZE(protseq_list); i++) if (!strcmp(protseq_list[i].name, protseq)) return &protseq_list[i]; return NULL; @@ -3269,7 +3267,7 @@ const struct protseq_ops *rpcrt4_get_protseq_ops(const char *protseq) static const struct connection_ops *rpcrt4_get_conn_protseq_ops(const char *protseq) { unsigned int i; - for(i=0; i<ARRAYSIZE(conn_protseq_list); i++) + for(i = 0; i < ARRAY_SIZE(conn_protseq_list); i++) if (!strcmp(conn_protseq_list[i].name, protseq)) return &conn_protseq_list[i]; return NULL; @@ -3507,7 +3505,7 @@ RPC_STATUS RpcTransport_ParseTopOfTower(const unsigned char *tower_data, (floor4->count_lhs != sizeof(floor4->protid))) return EPT_S_NOT_REGISTERED; - for(i = 0; i < ARRAYSIZE(conn_protseq_list); i++) + for(i = 0; i < ARRAY_SIZE(conn_protseq_list); i++) if ((protocol_floor->protid == conn_protseq_list[i].epm_protocols[0]) && (floor4->protid == conn_protseq_list[i].epm_protocols[1])) { @@ -3613,12 +3611,12 @@ RPC_STATUS WINAPI RpcNetworkInqProtseqsW( RPC_PROTSEQ_VECTORW** protseqs ) TRACE("(%p)\n", protseqs); - *protseqs = HeapAlloc(GetProcessHeap(), 0, sizeof(RPC_PROTSEQ_VECTORW)+(sizeof(unsigned short*)*ARRAYSIZE(protseq_list))); + *protseqs = HeapAlloc(GetProcessHeap(), 0, sizeof(RPC_PROTSEQ_VECTORW)+(sizeof(unsigned short*)*ARRAY_SIZE(protseq_list))); if (!*protseqs) goto end; pvector = *protseqs; pvector->Count = 0; - for (i = 0; i < ARRAYSIZE(protseq_list); i++) + for (i = 0; i < ARRAY_SIZE(protseq_list); i++) { pvector->Protseq[i] = HeapAlloc(GetProcessHeap(), 0, (strlen(protseq_list[i].name)+1)*sizeof(unsigned short)); if (pvector->Protseq[i] == NULL) @@ -3646,12 +3644,12 @@ RPC_STATUS WINAPI RpcNetworkInqProtseqsA(RPC_PROTSEQ_VECTORA** protseqs) TRACE("(%p)\n", protseqs); - *protseqs = HeapAlloc(GetProcessHeap(), 0, sizeof(RPC_PROTSEQ_VECTORW)+(sizeof(unsigned char*)*ARRAYSIZE(protseq_list))); + *protseqs = HeapAlloc(GetProcessHeap(), 0, sizeof(RPC_PROTSEQ_VECTORW)+(sizeof(unsigned char*)*ARRAY_SIZE(protseq_list))); if (!*protseqs) goto end; pvector = *protseqs; pvector->Count = 0; - for (i = 0; i < ARRAYSIZE(protseq_list); i++) + for (i = 0; i < ARRAY_SIZE(protseq_list); i++) { pvector->Protseq[i] = HeapAlloc(GetProcessHeap(), 0, strlen(protseq_list[i].name)+1); if (pvector->Protseq[i] == NULL)

1 0

Michael Stefaniuc : rpcrt4: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 19 Oct '18

19 Oct '18

Module: wine Branch: master Commit: ac0c0062b4e08155a9997d0f7fd5ecc5e1df76fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac0c0062b4e08155a9997d0f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Oct 19 22:11:34 2018 +0200 rpcrt4: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/cpsf.c | 2 +- dlls/rpcrt4/rpc_epmap.c | 4 ++-- dlls/rpcrt4/rpc_message.c | 6 +++--- dlls/rpcrt4/rpc_transport.c | 21 +++++++++++---------- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c index 9375c40..e92d226 100644 --- a/dlls/rpcrt4/cpsf.c +++ b/dlls/rpcrt4/cpsf.c @@ -279,7 +279,7 @@ HRESULT WINAPI NdrDllRegisterProxy(HMODULE hDll, /* register clsid to point to module */ strcpyW( keyname, clsidW ); strcatW( keyname, clsid ); - len = GetModuleFileNameW(hDll, module, sizeof(module)/sizeof(WCHAR)); + len = GetModuleFileNameW(hDll, module, ARRAY_SIZE(module)); if (len && len < sizeof(module)) { TRACE("registering CLSID %s => %s\n", debugstr_w(clsid), debugstr_w(module)); if (RegCreateKeyW(HKEY_CLASSES_ROOT, keyname, &key) == ERROR_SUCCESS) { diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index 1380bf3..803c9f8 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -148,7 +148,7 @@ static RPC_STATUS get_epm_handle_client(RPC_BINDING_HANDLE handle, RPC_BINDING_H if (bind->server) return RPC_S_INVALID_BINDING; - for (i = 0; i < sizeof(epm_endpoints)/sizeof(epm_endpoints[0]); i++) + for (i = 0; i < ARRAY_SIZE(epm_endpoints); i++) if (!strcmp(bind->Protseq, epm_endpoints[i].protseq)) pszEndpoint = epm_endpoints[i].endpoint; @@ -469,7 +469,7 @@ RPC_STATUS WINAPI RpcEpResolveBinding( RPC_BINDING_HANDLE Binding, RPC_IF_HANDLE { __TRY { - ept_map(handle, &uuid, tower, &entry_handle, sizeof(towers)/sizeof(towers[0]), &num_towers, towers, &status2); + ept_map(handle, &uuid, tower, &entry_handle, ARRAY_SIZE(towers), &num_towers, towers, &status2); /* FIXME: translate status2? */ } __EXCEPT(rpc_filter) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 3eea88a..59cd438 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -63,8 +63,8 @@ DWORD RPCRT4_GetHeaderSize(const RpcPktHdr *Header) 0, 0, sizeof(Header->auth3), 0, 0, 0, sizeof(Header->http) }; ULONG ret = 0; - - if (Header->common.ptype < sizeof(header_sizes) / sizeof(header_sizes[0])) { + + if (Header->common.ptype < ARRAY_SIZE(header_sizes)) { ret = header_sizes[Header->common.ptype]; if (ret == 0) FIXME("unhandled packet type %u\n", Header->common.ptype); @@ -691,7 +691,7 @@ RPC_STATUS RPCRT4_default_secure_packet(RpcConnection *Connection, SECURITY_STATUS sec_status; message.ulVersion = SECBUFFER_VERSION; - message.cBuffers = sizeof(buffers)/sizeof(buffers[0]); + message.cBuffers = ARRAY_SIZE(buffers); message.pBuffers = buffers; buffers[0].cbBuffer = hdr_size; diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 26641fd..ffe8b77 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1919,9 +1919,9 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) static const WCHAR wszRpcProxy[] = {'R','p','c','P','r','o','x','y','=',0}; static const WCHAR wszHttpProxy[] = {'H','t','t','p','P','r','o','x','y','=',0}; - if (!strncmpiW(option, wszRpcProxy, sizeof(wszRpcProxy)/sizeof(wszRpcProxy[0])-1)) + if (!strncmpiW(option, wszRpcProxy, ARRAY_SIZE(wszRpcProxy)-1)) { - const WCHAR *value_start = option + sizeof(wszRpcProxy)/sizeof(wszRpcProxy[0])-1; + const WCHAR *value_start = option + ARRAY_SIZE(wszRpcProxy)-1; const WCHAR *value_end; const WCHAR *p; @@ -1938,9 +1938,9 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) TRACE("RpcProxy value is %s\n", debugstr_wn(value_start, value_end-value_start)); servername = RPCRT4_strndupW(value_start, value_end-value_start); } - else if (!strncmpiW(option, wszHttpProxy, sizeof(wszHttpProxy)/sizeof(wszHttpProxy[0])-1)) + else if (!strncmpiW(option, wszHttpProxy, ARRAY_SIZE(wszHttpProxy)-1)) { - const WCHAR *value_start = option + sizeof(wszHttpProxy)/sizeof(wszHttpProxy[0])-1; + const WCHAR *value_start = option + ARRAY_SIZE(wszHttpProxy)-1; const WCHAR *value_end; value_end = strchrW(option, ','); @@ -2068,7 +2068,7 @@ static RPC_STATUS insert_content_length_header(HINTERNET request, DWORD len) { static const WCHAR fmtW[] = {'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','u','\r','\n',0}; - WCHAR header[sizeof(fmtW) / sizeof(fmtW[0]) + 10]; + WCHAR header[ARRAY_SIZE(fmtW) + 10]; sprintfW(header, fmtW, len); if ((HttpAddRequestHeadersW(request, header, -1, HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD))) return RPC_S_OK; @@ -2581,7 +2581,7 @@ static RPC_STATUS insert_authorization_header(HINTERNET request, ULONG scheme, c static const WCHAR basicW[] = {'B','a','s','i','c',' '}; static const WCHAR negotiateW[] = {'N','e','g','o','t','i','a','t','e',' '}; static const WCHAR ntlmW[] = {'N','T','L','M',' '}; - int scheme_len, auth_len = sizeof(authW) / sizeof(authW[0]), len = ((data_len + 2) * 4) / 3; + int scheme_len, auth_len = ARRAY_SIZE(authW), len = ((data_len + 2) * 4) / 3; const WCHAR *scheme_str; WCHAR *header, *ptr; RPC_STATUS status = RPC_S_SERVER_UNAVAILABLE; @@ -2590,15 +2590,15 @@ static RPC_STATUS insert_authorization_header(HINTERNET request, ULONG scheme, c { case RPC_C_HTTP_AUTHN_SCHEME_BASIC: scheme_str = basicW; - scheme_len = sizeof(basicW) / sizeof(basicW[0]); + scheme_len = ARRAY_SIZE(basicW); break; case RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE: scheme_str = negotiateW; - scheme_len = sizeof(negotiateW) / sizeof(negotiateW[0]); + scheme_len = ARRAY_SIZE(negotiateW); break; case RPC_C_HTTP_AUTHN_SCHEME_NTLM: scheme_str = ntlmW; - scheme_len = sizeof(ntlmW) / sizeof(ntlmW[0]); + scheme_len = ARRAY_SIZE(ntlmW); break; default: ERR("unknown scheme %u\n", scheme); @@ -2779,7 +2779,8 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) if (!url) return RPC_S_OUT_OF_MEMORY; memcpy(url, wszRpcProxyPrefix, sizeof(wszRpcProxyPrefix)); - MultiByteToWideChar(CP_ACP, 0, Connection->NetworkAddr, -1, url+sizeof(wszRpcProxyPrefix)/sizeof(wszRpcProxyPrefix[0])-1, strlen(Connection->NetworkAddr)+1); + MultiByteToWideChar(CP_ACP, 0, Connection->NetworkAddr, -1, url+ARRAY_SIZE(wszRpcProxyPrefix)-1, + strlen(Connection->NetworkAddr)+1); strcatW(url, wszColon); MultiByteToWideChar(CP_ACP, 0, Connection->Endpoint, -1, url+strlenW(url), strlen(Connection->Endpoint)+1);

1 0

Michael Stefaniuc : rpcrt4: Avoid a variable holding an ARRAY_SIZE result.
by Alexandre Julliard 19 Oct '18

19 Oct '18

Module: wine Branch: master Commit: 5ee8a6530bd8e71555d7104d74c1fcba237329f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ee8a6530bd8e71555d7104d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Oct 19 22:11:33 2018 +0200 rpcrt4: Avoid a variable holding an ARRAY_SIZE result. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 4fd091c..26641fd 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2403,12 +2403,11 @@ auth_schemes[] = { digestW, ARRAYSIZE(digestW) - 1, RPC_C_HTTP_AUTHN_SCHEME_DIGEST }, { negotiateW, ARRAYSIZE(negotiateW) - 1, RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE } }; -static const unsigned int num_auth_schemes = sizeof(auth_schemes)/sizeof(auth_schemes[0]); static DWORD auth_scheme_from_header( const WCHAR *header ) { unsigned int i; - for (i = 0; i < num_auth_schemes; i++) + for (i = 0; i < ARRAY_SIZE(auth_schemes); i++) { if (!strncmpiW( header, auth_schemes[i].str, auth_schemes[i].len ) && (header[auth_schemes[i].len] == ' ' || !header[auth_schemes[i].len])) return auth_schemes[i].scheme;

1 0

Kodama Nozomi : opengl32/tests: PFD_TYPE_RGBA should be in the iPixelType field, not in the flag field.
by Alexandre Julliard 19 Oct '18

19 Oct '18

Module: wine Branch: master Commit: faff3b02fb9d841c13ea1d04d9822248adb8cda9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=faff3b02fb9d841c13ea1d04… Author: Kodama Nozomi <nozomi.kodama(a)yahoo.com> Date: Tue Oct 16 22:09:13 2018 -1000 opengl32/tests: PFD_TYPE_RGBA should be in the iPixelType field, not in the flag field. Signed-off-by: Kodama Nozomi <nozomi.kodama(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 65a5914..c2fc4f4 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -244,8 +244,7 @@ static void test_choosepixelformat(void) PIXELFORMATDESCRIPTOR pfd = { sizeof(PIXELFORMATDESCRIPTOR), 1, /* version */ - PFD_DRAW_TO_WINDOW | - PFD_SUPPORT_OPENGL | + PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL, PFD_TYPE_RGBA, 0, /* color depth */ 0, 0, 0, 0, 0, 0, /* color bits */

1 0

Józef Kucia : vkd3d-shader: Simplify DepthReplacing execution mode handling.
by Alexandre Julliard 19 Oct '18

19 Oct '18

Module: vkd3d Branch: master Commit: 299f126f7ae82bcbf03cc32789557b78ffd03ccb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=299f126f7ae82bcbf03cc32… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 19 16:55:50 2018 +0200 vkd3d-shader: Simplify DepthReplacing execution mode handling. Signed-off-by: Józef Kucia <jkucia(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 | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 63ef7c2..8508741 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -248,14 +248,6 @@ struct vkd3d_spirv_builder struct vkd3d_spirv_stream execution_mode_stream; /* execution mode instructions */ - union - { - struct - { - bool depth_replacing; - } fragment; - } u; - struct vkd3d_spirv_stream original_function_stream; struct vkd3d_spirv_stream insertion_stream; size_t insertion_location; @@ -332,13 +324,6 @@ static void vkd3d_spirv_set_execution_model(struct vkd3d_spirv_builder *builder, } } -static void vkd3d_spirv_enable_depth_replacing(struct vkd3d_spirv_builder *builder) -{ - assert(builder->execution_model == SpvExecutionModelFragment); - - builder->u.fragment.depth_replacing = true; -} - static uint32_t vkd3d_spirv_opcode_word(SpvOp op, unsigned int word_count) { assert(!(op & ~SpvOpCodeMask)); @@ -1568,24 +1553,6 @@ static void vkd3d_spirv_builder_free(struct vkd3d_spirv_builder *builder) vkd3d_free(builder->iface); } -static void vkd3d_spirv_build_additional_execution_modes(struct vkd3d_spirv_builder *builder, - struct vkd3d_spirv_stream *stream) -{ - const uint32_t function_id = builder->main_function_id; - - switch (builder->execution_model) - { - case SpvExecutionModelFragment: - if (builder->u.fragment.depth_replacing) - vkd3d_spirv_build_op_execution_mode(stream, function_id, - SpvExecutionModeDepthReplacing, NULL, 0); - break; - - default: - break; - } -} - static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, struct vkd3d_shader_code *spirv) { @@ -1627,7 +1594,6 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, /* execution mode declarations */ vkd3d_spirv_stream_append(&stream, &builder->execution_mode_stream); - vkd3d_spirv_build_additional_execution_modes(builder, &stream); vkd3d_spirv_stream_append(&stream, &builder->debug_stream); vkd3d_spirv_stream_append(&stream, &builder->annotation_stream); @@ -2922,7 +2888,7 @@ static void vkd3d_dxbc_compiler_decorate_builtin(struct vkd3d_dxbc_compiler *com builtin = SpvBuiltInFragCoord; break; case SpvBuiltInFragDepth: - vkd3d_spirv_enable_depth_replacing(builder); + vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeDepthReplacing, NULL, 0); break; case SpvBuiltInLayer: vkd3d_spirv_enable_capability(builder, SpvCapabilityGeometry);

1 0

Józef Kucia : vkd3d-shader: Implement conservative depth output.
by Alexandre Julliard 19 Oct '18

19 Oct '18

Module: vkd3d Branch: master Commit: c81e28c03a33647bced0485fe4f2bfa4f5933a72 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c81e28c03a33647bced0485… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 19 16:55:49 2018 +0200 vkd3d-shader: Implement conservative depth output. Signed-off-by: Józef Kucia <jkucia(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 | 2 ++ libs/vkd3d-shader/spirv.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5daf07a..eb1729c 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1567,6 +1567,8 @@ static bool shader_sm4_is_scalar_register(const struct vkd3d_shader_register *re switch (reg->type) { case VKD3DSPR_DEPTHOUT: + case VKD3DSPR_DEPTHOUTGE: + case VKD3DSPR_DEPTHOUTLE: case VKD3DSPR_GSINSTID: case VKD3DSPR_LOCALTHREADINDEX: case VKD3DSPR_OUTPOINTID: diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f1eea02..63ef7c2 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2246,6 +2246,8 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf snprintf(buffer, buffer_size, "o%u", idx); break; case VKD3DSPR_DEPTHOUT: + case VKD3DSPR_DEPTHOUTGE: + case VKD3DSPR_DEPTHOUTLE: snprintf(buffer, buffer_size, "oDepth"); break; case VKD3DSPR_TESSCOORD: @@ -2470,6 +2472,8 @@ static uint32_t vkd3d_dxbc_compiler_get_register_id(struct vkd3d_dxbc_compiler * case VKD3DSPR_OUTPUT: case VKD3DSPR_COLOROUT: case VKD3DSPR_DEPTHOUT: + case VKD3DSPR_DEPTHOUTGE: + case VKD3DSPR_DEPTHOUTLE: case VKD3DSPR_CONSTBUFFER: case VKD3DSPR_IMMCONSTBUFFER: case VKD3DSPR_SAMPLER: @@ -3056,8 +3060,26 @@ vkd3d_register_builtins[] = {VKD3DSPR_TESSCOORD, {VKD3D_TYPE_FLOAT, 3, SpvBuiltInTessCoord}}, {VKD3DSPR_DEPTHOUT, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInFragDepth}}, + {VKD3DSPR_DEPTHOUTGE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInFragDepth}}, + {VKD3DSPR_DEPTHOUTLE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInFragDepth}}, }; +static void vkd3d_dxbc_compiler_emit_register_execution_mode(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_register *reg) +{ + switch (reg->type) + { + case VKD3DSPR_DEPTHOUTGE: + vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeDepthGreater, NULL, 0); + break; + case VKD3DSPR_DEPTHOUTLE: + vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeDepthLess, NULL, 0); + break; + default: + return; + } +} + static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_sysval( const struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_input_sysval_semantic sysval) { @@ -3458,6 +3480,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler if (builtin) { vkd3d_dxbc_compiler_decorate_builtin(compiler, id, builtin->spirv_builtin); + vkd3d_dxbc_compiler_emit_register_execution_mode(compiler, &dst->reg); if (component_idx) FIXME("Unhandled component index %u.\n", component_idx); }

1 0

Józef Kucia : vkd3d-shader: Translate bufinfo instructions.
by Alexandre Julliard 19 Oct '18

19 Oct '18

Module: vkd3d Branch: master Commit: dac94fb58ed0d47e3d6158d1adb440529b40371f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dac94fb58ed0d47e3d6158d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 19 16:55:48 2018 +0200 vkd3d-shader: Translate bufinfo instructions. Signed-off-by: Józef Kucia <jkucia(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 | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bb70dd5..f1eea02 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1263,6 +1263,13 @@ static uint32_t vkd3d_spirv_build_op_and(struct vkd3d_spirv_builder *builder, SpvOpBitwiseAnd, result_type, operand0, operand1); } +static uint32_t vkd3d_spirv_build_op_shift_left_logical(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t base, uint32_t shift) +{ + return vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, + SpvOpShiftLeftLogical, result_type, base, shift); +} + static uint32_t vkd3d_spirv_build_op_shift_right_logical(struct vkd3d_spirv_builder *builder, uint32_t result_type, uint32_t base, uint32_t shift) { @@ -6123,6 +6130,46 @@ static void vkd3d_dxbc_compiler_emit_atomic_instruction(struct vkd3d_dxbc_compil vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, result_id); } +static void vkd3d_dxbc_compiler_emit_bufinfo(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_dst_param *dst = instruction->dst; + const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t type_id, val_id, stride_id; + struct vkd3d_shader_image image; + uint32_t constituents[2]; + unsigned int write_mask; + + vkd3d_spirv_enable_capability(builder, SpvCapabilityImageQuery); + + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src->reg, VKD3D_IMAGE_FLAG_NONE); + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); + val_id = vkd3d_spirv_build_op_image_query_size(builder, type_id, image.image_id); + write_mask = VKD3DSP_WRITEMASK_0; + + if (image.structure_stride) + { + stride_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, image.structure_stride); + constituents[0] = vkd3d_spirv_build_op_udiv(builder, type_id, val_id, stride_id); + constituents[1] = stride_id; + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, ARRAY_SIZE(constituents)); + val_id = vkd3d_spirv_build_op_composite_construct(builder, + type_id, constituents, ARRAY_SIZE(constituents)); + write_mask |= VKD3DSP_WRITEMASK_1; + } + else if (image.raw) + { + val_id = vkd3d_spirv_build_op_shift_left_logical(builder, type_id, + val_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, 2)); + } + + val_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, + val_id, write_mask, VKD3D_TYPE_UINT, src->swizzle, dst->write_mask); + vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); +} + static void vkd3d_dxbc_compiler_emit_resinfo(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -6567,6 +6614,9 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_IMM_ATOMIC_XOR: vkd3d_dxbc_compiler_emit_atomic_instruction(compiler, instruction); break; + case VKD3DSIH_BUFINFO: + vkd3d_dxbc_compiler_emit_bufinfo(compiler, instruction); + break; case VKD3DSIH_RESINFO: vkd3d_dxbc_compiler_emit_resinfo(compiler, instruction); break;

1 0

Józef Kucia : vkd3d: Avoid heap memory allocations while updating descriptor tables.
by Alexandre Julliard 19 Oct '18

19 Oct '18

Module: vkd3d Branch: master Commit: dd26e59043fbd10cf3287e9f58e3bed7c76c6d10 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dd26e59043fbd10cf3287e9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 19 16:55:47 2018 +0200 vkd3d: Avoid heap memory allocations while updating descriptor tables. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index e17fca9..d8a6562 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2084,13 +2084,13 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list VkPipelineBindPoint bind_point, unsigned int index, D3D12_GPU_DESCRIPTOR_HANDLE base_descriptor) { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; + struct VkWriteDescriptorSet descriptor_writes[24], *current_descriptor_write; const struct d3d12_root_signature *root_signature = bindings->root_signature; - struct VkWriteDescriptorSet *descriptor_writes, *current_descriptor_write; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; - struct VkDescriptorImageInfo *image_infos, *current_image_info; + struct VkDescriptorImageInfo image_infos[24], *current_image_info; const struct d3d12_root_descriptor_table *descriptor_table; const struct d3d12_root_descriptor_table_range *range; - struct d3d12_device *device = list->device; + VkDevice vk_device = list->device->vk_device; unsigned int i, j, descriptor_count; struct d3d12_desc *descriptor; @@ -2110,14 +2110,6 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list return; } - if (!(descriptor_writes = vkd3d_calloc(descriptor_count, sizeof(*descriptor_writes)))) - return; - if (!(image_infos = vkd3d_calloc(descriptor_count, sizeof(*image_infos)))) - { - vkd3d_free(descriptor_writes); - return; - } - descriptor_count = 0; current_descriptor_write = descriptor_writes; current_image_info = image_infos; @@ -2153,13 +2145,18 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list ++descriptor_count; ++current_descriptor_write; ++current_image_info; + + if (descriptor_count == ARRAY_SIZE(descriptor_writes)) + { + VK_CALL(vkUpdateDescriptorSets(vk_device, descriptor_count, descriptor_writes, 0, NULL)); + descriptor_count = 0; + current_descriptor_write = descriptor_writes; + current_image_info = image_infos; + } } } - VK_CALL(vkUpdateDescriptorSets(device->vk_device, descriptor_count, descriptor_writes, 0, NULL)); - - vkd3d_free(descriptor_writes); - vkd3d_free(image_infos); + VK_CALL(vkUpdateDescriptorSets(vk_device, descriptor_count, descriptor_writes, 0, NULL)); } static bool vk_write_descriptor_set_from_root_descriptor(VkWriteDescriptorSet *vk_descriptor_write,

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2018