wine-commits October 2018

wine-commits@winehq.org

1 participants
602 discussions

Dmitry Timoshkov : crypt32: Add CryptSetKeyIdentifierProperty stub.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: 787133fc2117bd474e576b4f44d2fe7894930fc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=787133fc2117bd474e576b4f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 31 11:11:11 2018 +0300 crypt32: Add CryptSetKeyIdentifierProperty stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 8 ++++++++ dlls/crypt32/crypt32.spec | 1 + 2 files changed, 9 insertions(+) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index d09d049..a7a2605 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -3681,3 +3681,11 @@ const void * WINAPI CertCreateContext(DWORD dwContextType, DWORD dwEncodingType, return NULL; } } + +BOOL WINAPI CryptSetKeyIdentifierProperty(const CRYPT_HASH_BLOB *pKeyIdentifier, DWORD dwPropId, + DWORD dwFlags, LPCWSTR pwszComputerName, void *pvReserved, const void *pvData) +{ + FIXME("(%p, 0x%x, 0x%x, %s, %p, %p): stub\n", pKeyIdentifier, dwPropId, dwFlags, + debugstr_w(pwszComputerName), pvReserved, pvData); + return FALSE; +} diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 64d5aa9..fc32570 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -180,6 +180,7 @@ @ stdcall CryptSIPRetrieveSubjectGuidForCatalogFile(wstr long ptr) @ stdcall CryptSIPVerifyIndirectData(ptr ptr) @ stub CryptSetAsyncParam +@ stdcall CryptSetKeyIdentifierProperty(ptr long long wstr ptr ptr) @ stdcall CryptSetOIDFunctionValue(long str str wstr long ptr long) @ stub CryptSetProviderU @ stdcall CryptSignAndEncodeCertificate(long long long str ptr ptr ptr ptr ptr)

1 0

Henri Verbeet : wined3d: Validate format capabilities against the bind flags instead of the usage flags in resource_init ().
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: 00275acca850a337f5e97f78bb2d8eaea00ffc1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=00275acca850a337f5e97f78… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 31 13:19:51 2018 +0330 wined3d: Validate format capabilities against the bind flags instead of the usage flags in resource_init(). Note that buffer resources don't have an inherent format, so validating bind flags against WINED3DFMT_UNKNOWN doesn't make a lot of sense. This wasn't an issue previously because d3d11 doesn't set the usage flags corresponding to the bind flags for buffer resources, and earlier versions of D3D didn't allow buffers to be used as e.g. shader resources. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/resource.c | 47 ++++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 512546d..ff58456 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -107,28 +107,33 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * if (base_type == WINED3D_GL_RES_TYPE_COUNT) base_type = gl_type; - if ((usage & WINED3DUSAGE_RENDERTARGET) && !(format->flags[gl_type] & WINED3DFMT_FLAG_RENDERTARGET)) + if (type != WINED3D_RTYPE_BUFFER) { - WARN("Format %s cannot be used for render targets.\n", debug_d3dformat(format->id)); - continue; - } - if ((usage & WINED3DUSAGE_DEPTHSTENCIL) - && !(format->flags[gl_type] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) - { - WARN("Format %s cannot be used for depth/stencil buffers.\n", debug_d3dformat(format->id)); - continue; - } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO - && usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL) - && !(format->flags[gl_type] & WINED3DFMT_FLAG_FBO_ATTACHABLE)) - { - WARN("Render target or depth stencil is not FBO attachable.\n"); - continue; - } - if ((usage & WINED3DUSAGE_TEXTURE) && !(format->flags[gl_type] & WINED3DFMT_FLAG_TEXTURE)) - { - WARN("Format %s cannot be used for texturing.\n", debug_d3dformat(format->id)); - continue; + if ((bind_flags & WINED3D_BIND_RENDER_TARGET) + && !(format->flags[gl_type] & WINED3DFMT_FLAG_RENDERTARGET)) + { + WARN("Format %s cannot be used for render targets.\n", debug_d3dformat(format->id)); + continue; + } + if ((bind_flags & WINED3D_BIND_DEPTH_STENCIL) + && !(format->flags[gl_type] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) + { + WARN("Format %s cannot be used for depth/stencil buffers.\n", debug_d3dformat(format->id)); + continue; + } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO + && bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL) + && !(format->flags[gl_type] & WINED3DFMT_FLAG_FBO_ATTACHABLE)) + { + WARN("Render target or depth stencil is not FBO attachable.\n"); + continue; + } + if ((bind_flags & WINED3D_BIND_SHADER_RESOURCE) + && !(format->flags[gl_type] & WINED3DFMT_FLAG_TEXTURE)) + { + WARN("Format %s cannot be used for texturing.\n", debug_d3dformat(format->id)); + continue; + } } if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot

1 0

Henri Verbeet : wined3d: Pass bind flags to wined3d_get_format().
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: 7d83ebeed24858e553f49293e1426529ce959af3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d83ebeed24858e553f49293… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 31 13:19:50 2018 +0330 wined3d: Pass bind flags to wined3d_get_format(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context.c | 14 +++++++------- dlls/wined3d/directx.c | 14 +++++++------- dlls/wined3d/resource.c | 4 ++-- dlls/wined3d/surface.c | 2 +- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/texture.c | 8 ++++---- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/view.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 10 files changed, 30 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7d83ebeed24858e553f4…

1 0

Henri Verbeet : wined3d: Pass bind flags to wined3d_check_device_format().
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: ae6553bd0b2c666f3002a98eb555e2a2c741dabe URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae6553bd0b2c666f3002a98e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 31 13:19:49 2018 +0330 wined3d: Pass bind flags to wined3d_check_device_format(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 12 ++++----- dlls/d3d8/directx.c | 8 +++--- dlls/d3d9/directx.c | 8 +++--- dlls/d3d9/texture.c | 5 ++-- dlls/ddraw/ddraw.c | 8 +++--- dlls/ddraw/device.c | 10 ++++---- dlls/ddraw/surface.c | 16 ++++++++---- dlls/wined3d/directx.c | 65 ++++++++++++++++++++++++++++++----------------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 10 files changed, 83 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae6553bd0b2c666f3002…

1 0

Henri Verbeet : wined3d: Pass correct bind flags to swapchain creation functions.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: 543605ca9d43f9aa394a5c2f859805d0a61ea74f URL: https://source.winehq.org/git/wine.git/?a=commit;h=543605ca9d43f9aa394a5c2f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 31 13:19:48 2018 +0330 wined3d: Pass correct bind flags to swapchain creation functions. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/ddraw/ddraw.c | 2 +- dlls/dxgi/device.c | 12 ++++++------ dlls/dxgi/dxgi_private.h | 4 ++-- dlls/dxgi/swapchain.c | 6 +++--- dlls/dxgi/utils.c | 22 +++++++++++----------- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/swapchain.c | 12 ++++++------ include/wine/wined3d.h | 2 +- 10 files changed, 36 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=543605ca9d43f9aa394a…

1 0

Henri Verbeet : wined3d: Pass correct bind flags to texture creation functions.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: 7cba91571061753e7cf0c6f67bd82a86d7cf7827 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cba91571061753e7cf0c6f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 31 13:19:47 2018 +0330 wined3d: Pass correct bind flags to texture creation functions. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/buffer.c | 2 +- dlls/d3d11/d3d11_private.h | 11 ++++++++++- dlls/d3d11/device.c | 2 +- dlls/d3d11/texture.c | 3 +++ dlls/d3d11/utils.c | 15 --------------- dlls/d3d8/buffer.c | 4 ++-- dlls/d3d8/d3d8_private.h | 21 +++++++++++++++++++-- dlls/d3d8/device.c | 1 + dlls/d3d8/surface.c | 2 +- dlls/d3d8/texture.c | 9 ++++++--- dlls/d3d8/volume.c | 2 +- dlls/d3d9/buffer.c | 4 ++-- dlls/d3d9/d3d9_private.h | 21 +++++++++++++++++++-- dlls/d3d9/device.c | 1 + dlls/d3d9/surface.c | 2 +- dlls/d3d9/texture.c | 3 +++ dlls/d3d9/volume.c | 2 +- dlls/ddraw/surface.c | 10 ++++++++++ dlls/dxgi/device.c | 5 +++++ dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/device.c | 3 +++ dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/resource.c | 1 + dlls/wined3d/surface.c | 2 ++ dlls/wined3d/swapchain.c | 7 +++++++ dlls/wined3d/texture.c | 3 ++- include/wine/wined3d.h | 2 ++ 27 files changed, 106 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7cba91571061753e7cf0…

1 0

Józef Kucia : vkd3d-shader: Try harder to avoid using private variables for inputs.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: vkd3d Branch: master Commit: 7338ba0337d2847a41be0e85eebc2da376ccda0c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7338ba0337d2847a41be0e8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 31 15:26:48 2018 +0100 vkd3d-shader: Try harder to avoid using private variables for inputs. 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 | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a754489..e70c2d6 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2442,8 +2442,8 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp const struct vkd3d_shader_register *reg, struct vkd3d_shader_register_info *register_info) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + unsigned int component_count, index_count = 0; uint32_t type_id, ptr_type_id; - unsigned int index_count = 0; uint32_t indexes[2]; if (reg->type == VKD3DSPR_CONSTBUFFER) @@ -2472,7 +2472,8 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp if (index_count) { - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); + component_count = vkd3d_write_mask_component_count(register_info->write_mask); + type_id = vkd3d_spirv_get_type_id(builder, register_info->component_type, component_count); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, register_info->storage_class, type_id); register_info->id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, register_info->id, indexes, index_count); @@ -2642,8 +2643,9 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_scalar(struct vkd3d_dxbc_compiler reg_component_count = vkd3d_write_mask_component_count(reg_info->write_mask); - if (component_idx > reg_component_count) - ERR("Invalid component_idx for register %#x, %u.\n", reg->type, reg->idx[0].offset); + if (!(reg_info->write_mask & (VKD3DSP_WRITEMASK_0 << component_idx))) + ERR("Invalid component_idx for register %#x, %u (write_mask %#x).\n", + reg->type, reg->idx[0].offset, reg_info->write_mask); type_id = vkd3d_spirv_get_type_id(builder, reg_info->component_type, 1); reg_id = reg_info->id; @@ -3175,6 +3177,20 @@ static const struct vkd3d_shader_signature_element *vkd3d_find_signature_element return NULL; } +static unsigned int vkd3d_count_signature_elements_for_reg( + const struct vkd3d_shader_signature *signature, unsigned int reg_idx) +{ + unsigned int i, count; + + count = 0; + for (i = 0; i < signature->element_count; ++i) + { + if (signature->elements[i].register_index == reg_idx) + ++count; + } + return count; +} + static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) { @@ -3228,9 +3244,17 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi else { component_type = signature_element->component_type; - input_component_count = component_count; + input_component_count = vkd3d_write_mask_component_count(signature_element->mask & 0xff); + component_idx = vkd3d_write_mask_get_component_idx(signature_element->mask & 0xff); + } + + use_private_var = builtin && builtin->fixup_pfn; + if (input_component_count != VKD3D_VEC4_SIZE + && vkd3d_count_signature_elements_for_reg(compiler->input_signature, reg_idx) > 1) + { + use_private_var = true; + component_count = VKD3D_VEC4_SIZE; } - assert(component_count <= input_component_count); storage_class = SpvStorageClassInput; input_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, @@ -3247,8 +3271,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx); } - use_private_var = component_count != VKD3D_VEC4_SIZE || (builtin && builtin->fixup_pfn); - vkd3d_symbol_make_register(&reg_symbol, reg); if (!use_private_var) @@ -3259,14 +3281,15 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi { storage_class = SpvStorageClassPrivate; var_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, - storage_class, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE, array_size); + storage_class, VKD3D_TYPE_FLOAT, component_count, array_size); } if (!entry) { reg_symbol.id = var_id; reg_symbol.info.reg.storage_class = storage_class; reg_symbol.info.reg.component_type = use_private_var ? VKD3D_TYPE_FLOAT : component_type; - reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; + reg_symbol.info.reg.write_mask = use_private_var + ? vkd3d_write_mask_from_component_count(component_count) : signature_element->mask & 0xff; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg);

1 0

Józef Kucia : vkd3d-shader: Use vkd3d_dxbc_compiler_emit_swizzle_ext() in vkd3d_dxbc_compiler_emit_input().
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: vkd3d Branch: master Commit: 2ace6f204da3398e0f9a297972fc50089871994c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2ace6f204da3398e0f9a297… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 31 15:26:47 2018 +0100 vkd3d-shader: Use vkd3d_dxbc_compiler_emit_swizzle_ext() in vkd3d_dxbc_compiler_emit_input(). 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 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9493d53..a754489 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3223,6 +3223,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi { component_type = builtin->component_type; input_component_count = builtin->component_count; + component_idx = 0; } else { @@ -3238,8 +3239,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi if (builtin) { vkd3d_dxbc_compiler_decorate_builtin(compiler, input_id, builtin->spirv_builtin); - if (component_idx) - FIXME("Unhandled component index %u.\n", component_idx); } else { @@ -3301,9 +3300,9 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi val_id = vkd3d_spirv_build_op_bitcast(builder, float_type_id, val_id); } - if (input_component_count != component_count) - val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, - val_id, VKD3D_TYPE_FLOAT, VKD3D_NO_SWIZZLE, dst->write_mask); + val_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, val_id, + vkd3d_write_mask_from_component_count(input_component_count) << component_idx, + VKD3D_TYPE_FLOAT, VKD3D_NO_SWIZZLE, dst->write_mask); vkd3d_dxbc_compiler_emit_store_reg(compiler, &dst_reg, dst->write_mask, val_id); }

1 0

Józef Kucia : vkd3d-shader: Check more accurately if swizzle is required.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: vkd3d Branch: master Commit: 11a65da62a74f47c6205739558b0664721f7f0b3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=11a65da62a74f47c6205739… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 31 15:26:46 2018 +0100 vkd3d-shader: Check more accurately if swizzle is required. Eliminates redundant OpVectorShuffle 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 | 8 +++++--- libs/vkd3d-shader/vkd3d_shader_private.h | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index dee561a..9493d53 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2528,10 +2528,13 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle_ext(struct vkd3d_dxbc_compiler struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, components[VKD3D_VEC4_SIZE]; - if (swizzle == VKD3D_NO_SWIZZLE && write_mask == val_write_mask) + component_count = vkd3d_write_mask_component_count(write_mask); + val_component_count = vkd3d_write_mask_component_count(val_write_mask); + + if (component_count == val_component_count + && vkd3d_compact_swizzle(swizzle, write_mask) == vkd3d_compact_swizzle(VKD3D_NO_SWIZZLE, val_write_mask)) return val_id; - component_count = vkd3d_write_mask_component_count(write_mask); type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); if (component_count == 1) @@ -2541,7 +2544,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle_ext(struct vkd3d_dxbc_compiler return vkd3d_spirv_build_op_composite_extract1(builder, type_id, val_id, component_idx); } - val_component_count = vkd3d_write_mask_component_count(val_write_mask); if (val_component_count == 1) { for (i = 0, component_idx = 0; i < VKD3D_VEC4_SIZE; ++i) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index dd3650b..651a595 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -882,6 +882,22 @@ static inline unsigned int vkd3d_swizzle_get_component(DWORD swizzle, return (swizzle >> VKD3D_SWIZZLE_SHIFT(idx)) & VKD3D_SWIZZLE_MASK; } +static inline unsigned int vkd3d_compact_swizzle(unsigned int swizzle, unsigned int write_mask) +{ + unsigned int i, compacted_swizzle = 0; + + for (i = 0; i < VKD3D_VEC4_SIZE; ++i) + { + if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) + { + compacted_swizzle <<= VKD3D_SWIZZLE_SHIFT(1); + compacted_swizzle |= vkd3d_swizzle_get_component(swizzle, i); + } + } + + return compacted_swizzle; +} + #define VKD3D_DXBC_MAX_SOURCE_COUNT 6 #define VKD3D_DXBC_HEADER_SIZE (8 * sizeof(uint32_t))

1 0

Francois Gouget : testbot/build: Fix a typo in WineReconfig.pl.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: tools Branch: master Commit: f2c1a403a0dae5ab665ab924898833b0c25e657d URL: https://source.winehq.org/git/tools.git/?a=commit;h=f2c1a403a0dae5ab665ab92… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 31 03:00:43 2018 +0100 testbot/build: Fix a typo in WineReconfig.pl. The build is now derived directly from the mission. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineReconfig.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 53ce319..898f72c 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -108,12 +108,12 @@ sub UpdateWinePrefixes($) { next if ($Mission->{test} eq "build"); - SetupWineEnvironment($Build); + SetupWineEnvironment($Mission->{Build}); InfoMsg "\nRecreating the $Mission->{Build} wineprefix\n"; # Wait for the wineprefix creation to complete so it is really done # before the snapshot gets updated. - my $ErrMessage = CreateWinePrefix($Build, "wait"); + my $ErrMessage = CreateWinePrefix($Mission->{Build}, "wait"); if (defined $ErrMessage) { LogMsg "$ErrMessage\n";

1 0

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