October 2023 - Wine-Commits

Brendan Shanks : winemac.drv: Use @autoreleasepool instead of NSAutoreleasePool.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: wine Branch: master Commit: c937e991e1acad45c78a3b5a2977cef11a6b9f89 URL: https://gitlab.winehq.org/wine/wine/-/commit/c937e991e1acad45c78a3b5a2977ce… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Oct 4 22:08:00 2023 -0700 winemac.drv: Use @autoreleasepool instead of NSAutoreleasePool. --- dlls/winemac.drv/cocoa_app.m | 64 +++++++++++----------- dlls/winemac.drv/cocoa_clipboard.m | 5 +- dlls/winemac.drv/cocoa_display.m | 21 ++++---- dlls/winemac.drv/cocoa_event.m | 57 ++++++++++---------- dlls/winemac.drv/cocoa_main.m | 54 ++++++++++--------- dlls/winemac.drv/cocoa_opengl.m | 29 +++++----- dlls/winemac.drv/cocoa_window.m | 105 +++++++++++++++++++------------------ 7 files changed, 172 insertions(+), 163 deletions(-)

1 0

Ally Sommers : server: Move getpeername() implementation from ntdll/unix.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: wine Branch: master Commit: 3582ba9dc4b711747cdd52f285a5243b9278db6e URL: https://gitlab.winehq.org/wine/wine/-/commit/3582ba9dc4b711747cdd52f285a524… Author: Ally Sommers <dropbear.sh(a)gmail.com> Date: Thu Jun 15 11:51:33 2023 -0700 server: Move getpeername() implementation from ntdll/unix. This brings getpeername() in line with getsockname(), which is also implemented in wineserver. It also allows getpeername() to return a possibly-more-accurate peer name, as in the case of AF_UNIX sockets. --- dlls/ntdll/unix/socket.c | 24 ++----------------- dlls/ws2_32/socket.c | 13 ++++++----- dlls/ws2_32/tests/sock.c | 28 +++++++++------------- server/sock.c | 61 +++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 78 insertions(+), 48 deletions(-)

1 0

Paul Gofman : ntdll: Map EDESTADDRREQ to STATUS_INVALID_CONNECTION.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: wine Branch: master Commit: 4b9a095e841ddb6387797e0fa474a9a6184c1ed5 URL: https://gitlab.winehq.org/wine/wine/-/commit/4b9a095e841ddb6387797e0fa474a9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 27 20:17:13 2023 -0600 ntdll: Map EDESTADDRREQ to STATUS_INVALID_CONNECTION. --- dlls/ntdll/unix/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index e09bf34b07d..3f0ac8cb84e 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -169,7 +169,7 @@ static NTSTATUS sock_errno_to_status( int err ) case EWOULDBLOCK: return STATUS_DEVICE_NOT_READY; case EALREADY: return STATUS_NETWORK_BUSY; case ENOTSOCK: return STATUS_OBJECT_TYPE_MISMATCH; - case EDESTADDRREQ: return STATUS_INVALID_PARAMETER; + case EDESTADDRREQ: return STATUS_INVALID_CONNECTION; case EMSGSIZE: return STATUS_BUFFER_OVERFLOW; case EPROTONOSUPPORT: case ESOCKTNOSUPPORT: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index eddef24048c..fcf4da3851e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -13901,7 +13901,7 @@ static void test_connect_udp(void) SetLastError(0xdeadbeef); ret = send(client, "data", 4, 0); ok(ret == -1, "got %d\n", ret); - todo_wine ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); + ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = recv(server, buffer, sizeof(buffer), 0); @@ -13949,7 +13949,7 @@ static void test_connect_udp(void) SetLastError(0xdeadbeef); ret = send(server, "data", 4, 0); ok(ret == -1, "got %d\n", ret); - todo_wine ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); + ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); ok(!ret, "got error %lu\n", GetLastError());

1 0

Francisco Casas : vkd3d-shader/tpf: Use lookup table for opcode_info_from_sm4().
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: vkd3d Branch: master Commit: 014960b64bf5271303da74e18c380891e7de74d3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/014960b64bf5271303da74e18c380… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Jul 27 18:34:26 2023 -0400 vkd3d-shader/tpf: Use lookup table for opcode_info_from_sm4(). Makes get_opcode_info() and thus, tpf reading a little faster. --- libs/vkd3d-shader/tpf.c | 599 ++++++++++++++++++++++++------------------------ 1 file changed, 302 insertions(+), 297 deletions(-)

1 0

Francisco Casas : vkd3d-shader/tpf: Don't store sm4 instruction extra bits in the opcode.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: vkd3d Branch: master Commit: 88b644a11dfbe261aa80d66a3ec2c73def75d1e5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/88b644a11dfbe261aa80d66a3ec2c… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Aug 1 22:28:54 2023 -0400 vkd3d-shader/tpf: Don't store sm4 instruction extra bits in the opcode. Adding extra bits to instr->opcode doesn't seem correct, given that it is an enum. For instance, get_opcode_info() would return NULL if additional bits are added to instr->opcode. This is not a problem now because that function is called when reading and not writing. --- libs/vkd3d-shader/tpf.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 21298aba..34a7da54 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3632,6 +3632,7 @@ static uint32_t sm4_encode_instruction_modifier(const struct sm4_instruction_mod struct sm4_instruction { enum vkd3d_sm4_opcode opcode; + uint32_t extra_bits; struct sm4_instruction_modifier modifiers[1]; unsigned int modifier_count; @@ -3981,7 +3982,7 @@ static void sm4_write_src_register(const struct tpf_writer *tpf, const struct vk static void write_sm4_instruction(const struct tpf_writer *tpf, const struct sm4_instruction *instr) { struct vkd3d_bytecode_buffer *buffer = tpf->buffer; - uint32_t token = instr->opcode; + uint32_t token = instr->opcode | instr->extra_bits; unsigned int size, i, j; size_t token_position; @@ -4076,7 +4077,7 @@ static void write_sm4_dcl_samplers(const struct tpf_writer *tpf, const struct ex component_type = hlsl_type_get_component_type(tpf->ctx, resource->data_type, 0); if (component_type->sampler_dim == HLSL_SAMPLER_DIM_COMPARISON) - instr.opcode |= VKD3D_SM4_SAMPLER_COMPARISON << VKD3D_SM4_SAMPLER_MODE_SHIFT; + instr.extra_bits |= VKD3D_SM4_SAMPLER_COMPARISON << VKD3D_SM4_SAMPLER_MODE_SHIFT; assert(resource->regset == HLSL_REGSET_SAMPLERS); @@ -4135,12 +4136,12 @@ static void write_sm4_dcl_textures(const struct tpf_writer *tpf, const struct ex { instr.opcode = VKD3D_SM4_OP_DCL_RESOURCE; } - instr.opcode |= (sm4_resource_dimension(component_type) << VKD3D_SM4_RESOURCE_TYPE_SHIFT); + instr.extra_bits |= (sm4_resource_dimension(component_type) << VKD3D_SM4_RESOURCE_TYPE_SHIFT); if (component_type->sampler_dim == HLSL_SAMPLER_DIM_2DMS || component_type->sampler_dim == HLSL_SAMPLER_DIM_2DMSARRAY) { - instr.opcode |= component_type->sample_count << VKD3D_SM4_RESOURCE_SAMPLE_COUNT_SHIFT; + instr.extra_bits |= component_type->sample_count << VKD3D_SM4_RESOURCE_SAMPLE_COUNT_SHIFT; } write_sm4_instruction(tpf, &instr); @@ -4217,7 +4218,7 @@ static void write_sm4_dcl_semantic(const struct tpf_writer *tpf, const struct hl if ((var->storage_modifiers & HLSL_STORAGE_NOINTERPOLATION) || type_is_integer(var->data_type)) mode = VKD3DSIM_CONSTANT; - instr.opcode |= mode << VKD3D_SM4_INTERPOLATION_MODE_SHIFT; + instr.extra_bits |= mode << VKD3D_SM4_INTERPOLATION_MODE_SHIFT; } } else @@ -4575,7 +4576,7 @@ static void write_sm4_sampleinfo(const struct tpf_writer *tpf, const struct hlsl memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_SAMPLE_INFO; if (dst->data_type->base_type == HLSL_TYPE_UINT) - instr.opcode |= VKD3DSI_SAMPLE_INFO_UINT << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT; + instr.extra_bits |= VKD3DSI_SAMPLE_INFO_UINT << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT; sm4_dst_from_node(&instr.dsts[0], dst); instr.dst_count = 1; @@ -4597,7 +4598,7 @@ static void write_sm4_resinfo(const struct tpf_writer *tpf, const struct hlsl_ir memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_RESINFO; if (dst->data_type->base_type == HLSL_TYPE_UINT) - instr.opcode |= VKD3DSI_RESINFO_UINT << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT; + instr.extra_bits |= VKD3DSI_RESINFO_UINT << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT; sm4_dst_from_node(&instr.dsts[0], dst); instr.dst_count = 1;

1 0

Francisco Casas : vkd3d-shader/tpf: Apply mask to swizzle when swizzle type is scalar.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: vkd3d Branch: master Commit: 0a5fa80f0204e7c757c7c1a9498988175056568f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0a5fa80f0204e7c757c7c1a949898… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Jul 18 20:21:45 2023 -0400 vkd3d-shader/tpf: Apply mask to swizzle when swizzle type is scalar. In native's output, for scalar swizzles only the first component of the swizzle is written, the others are left as zero. --- libs/vkd3d-shader/tpf.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index b72f4839..21298aba 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3913,8 +3913,13 @@ static void sm4_write_src_register(const struct tpf_writer *tpf, const struct vk token |= reg_dim << VKD3D_SM4_DIMENSION_SHIFT; if (reg_dim == VKD3D_SM4_DIMENSION_VEC4) { - token |= (uint32_t)register_type_info->default_src_swizzle_type << VKD3D_SM4_SWIZZLE_TYPE_SHIFT; - token |= swizzle_to_sm4(src->swizzle) << VKD3D_SM4_SWIZZLE_SHIFT; + uint32_t swizzle_type = (uint32_t)register_type_info->default_src_swizzle_type; + + token |= swizzle_type << VKD3D_SM4_SWIZZLE_TYPE_SHIFT; + if (swizzle_type == VKD3D_SM4_SWIZZLE_SCALAR) + token |= (swizzle_to_sm4(src->swizzle) & 0x3) << VKD3D_SM4_SWIZZLE_SHIFT; + else + token |= swizzle_to_sm4(src->swizzle) << VKD3D_SM4_SWIZZLE_SHIFT; } switch (src->modifiers)

1 0

Francisco Casas : vkd3d-shader/tpf: Don't calculate instruction size in advance.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: vkd3d Branch: master Commit: f06169afc5b835db538363131fcb525d8f30b493 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f06169afc5b835db538363131fcb5… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Oct 3 12:10:23 2023 -0300 vkd3d-shader/tpf: Don't calculate instruction size in advance. Co-authored-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/tpf.c | 48 ++++++++++++------------------------------------ 1 file changed, 12 insertions(+), 36 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index c6c59c18..b72f4839 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3973,53 +3973,25 @@ static void sm4_write_src_register(const struct tpf_writer *tpf, const struct vk } } -static uint32_t sm4_token_count_from_dst_register(const struct vkd3d_shader_dst_param *dst) -{ - uint32_t order = 1; - if (dst->reg.type == VKD3DSPR_IMMCONST) - order += dst->reg.dimension == VSIR_DIMENSION_VEC4 ? 4 : 1; - order += dst->reg.idx_count; - return order; -} - -static uint32_t sm4_token_count_from_src_register(const struct vkd3d_shader_src_param *src) -{ - uint32_t order = 1; - if (src->reg.type == VKD3DSPR_IMMCONST) - order += src->reg.dimension == VSIR_DIMENSION_VEC4 ? 4 : 1; - order += src->reg.idx_count; - if (src->modifiers) - ++order; - return order; -} - static void write_sm4_instruction(const struct tpf_writer *tpf, const struct sm4_instruction *instr) { struct vkd3d_bytecode_buffer *buffer = tpf->buffer; uint32_t token = instr->opcode; - unsigned int size = 1, i, j; - - size += instr->modifier_count; - for (i = 0; i < instr->dst_count; ++i) - size += sm4_token_count_from_dst_register(&instr->dsts[i]); - for (i = 0; i < instr->src_count; ++i) - size += sm4_token_count_from_src_register(&instr->srcs[i]); - size += instr->idx_count; - if (instr->byte_stride) - ++size; - - token |= (size << VKD3D_SM4_INSTRUCTION_LENGTH_SHIFT); + unsigned int size, i, j; + size_t token_position; if (instr->modifier_count > 0) token |= VKD3D_SM4_INSTRUCTION_MODIFIER; - put_u32(buffer, token); + + token_position = put_u32(buffer, 0); for (i = 0; i < instr->modifier_count; ++i) { - token = sm4_encode_instruction_modifier(&instr->modifiers[i]); + uint32_t modifier_token = sm4_encode_instruction_modifier(&instr->modifiers[i]); + if (instr->modifier_count > i + 1) - token |= VKD3D_SM4_INSTRUCTION_MODIFIER; - put_u32(buffer, token); + modifier_token |= VKD3D_SM4_INSTRUCTION_MODIFIER; + put_u32(buffer, modifier_token); } for (i = 0; i < instr->dst_count; ++i) @@ -4033,6 +4005,10 @@ static void write_sm4_instruction(const struct tpf_writer *tpf, const struct sm4 for (j = 0; j < instr->idx_count; ++j) put_u32(buffer, instr->idx[j]); + + size = (bytecode_get_size(buffer) - token_position) / sizeof(uint32_t); + token |= (size << VKD3D_SM4_INSTRUCTION_LENGTH_SHIFT); + set_u32(buffer, token_position, token); } static bool encode_texel_offset_as_aoffimmi(struct sm4_instruction *instr,

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Remove conditional branching when condition is a compile time constant.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: vkd3d Branch: master Commit: 7c378cc6f9e6a9cdc5012e584dc9180cdac1e783 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7c378cc6f9e6a9cdc5012e584dc91… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 27 19:17:40 2023 +0200 vkd3d-shader/hlsl: Remove conditional branching when condition is a compile time constant. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 20 ++++++++++++++++++++ tests/hlsl/conditional.shader_test | 17 +++++++++++++++++ tests/hlsl/static-initializer.shader_test | 4 ++-- 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 99363852..c0d18a3e 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2062,6 +2062,25 @@ static bool remove_trivial_swizzles(struct hlsl_ctx *ctx, struct hlsl_ir_node *i return true; } +static bool remove_trivial_conditional_branches(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_constant *condition; + struct hlsl_ir_if *iff; + + if (instr->type != HLSL_IR_IF) + return false; + iff = hlsl_ir_if(instr); + if (iff->condition.node->type != HLSL_IR_CONSTANT) + return false; + condition = hlsl_ir_constant(iff->condition.node); + + list_move_before(&instr->entry, condition->value.u[0].u ? &iff->then_block.instrs : &iff->else_block.instrs); + list_remove(&instr->entry); + hlsl_free_instr(instr); + + return true; +} + static bool lower_nonconstant_vector_derefs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block) { struct hlsl_ir_node *idx; @@ -4417,6 +4436,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry progress |= hlsl_copy_propagation_execute(ctx, body); progress |= hlsl_transform_ir(ctx, fold_swizzle_chains, body, NULL); progress |= hlsl_transform_ir(ctx, remove_trivial_swizzles, body, NULL); + progress |= hlsl_transform_ir(ctx, remove_trivial_conditional_branches, body, NULL); } while (progress); diff --git a/tests/hlsl/conditional.shader_test b/tests/hlsl/conditional.shader_test index b3b18dc1..810f7366 100644 --- a/tests/hlsl/conditional.shader_test +++ b/tests/hlsl/conditional.shader_test @@ -82,3 +82,20 @@ float4 main(uniform float4 u) : sv_target uniform 0 float4 0.0 0.0 0.0 0.0 draw quad probe all rgba (0.9, 0.8, 0.7, 0.6) + +[pixel shader] +float4 main() : sv_target +{ + bool c = false; + float a = -1.0f; + if (c) + return float4(1.0, 2.0, 3.0, 4.0); + else if (a > 0) + return float4(5.0, 6.0, 7.0, 8.0); + else + return float4(9.0, 10.0, 11.0, 12.0); +} + +[test] +draw quad +probe all rgba (9.0, 10.0, 11.0, 12.0) diff --git a/tests/hlsl/static-initializer.shader_test b/tests/hlsl/static-initializer.shader_test index 8415d851..394b4a9a 100644 --- a/tests/hlsl/static-initializer.shader_test +++ b/tests/hlsl/static-initializer.shader_test @@ -85,7 +85,7 @@ float4 main() : sv_target } -[pixel shader todo] +[pixel shader] // This is allowed in 10.0.10011.16384 but not in 9.29.952.3111 static Texture2D tex; sampler sam; @@ -177,7 +177,7 @@ size (1, 1) 0.5 -[pixel shader todo] +[pixel shader] // This is allowed in 10.0.10011.16384 but not in 9.29.952.3111 static RWTexture2D<float> tex;

1 0

Nikolay Sivov : vkd3d-shader: Add constant folding for 'rsq'.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: vkd3d Branch: master Commit: f3389789b2a85c6228c13edac9cad92f3229fba3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f3389789b2a85c6228c13edac9cad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 26 14:32:24 2023 +0200 vkd3d-shader: Add constant folding for 'rsq'. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 44 +++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index c9554fd5..64629dc2 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -429,6 +429,46 @@ static bool fold_rcp(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons return true; } +static bool fold_rsq(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, + const struct hlsl_ir_constant *src, const struct vkd3d_shader_location *loc) +{ + enum hlsl_base_type type = dst_type->base_type; + unsigned int k; + + assert(type == src->node.data_type->base_type); + + for (k = 0; k < dst_type->dimx; ++k) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + if (ctx->profile->major_version >= 4) + { + if (src->value.u[k].f < 0.0f) + hlsl_warning(ctx, loc, VKD3D_SHADER_WARNING_HLSL_IMAGINARY_NUMERIC_RESULT, + "Imaginary square root result."); + else if (src->value.u[k].f == 0.0f) + hlsl_warning(ctx, loc, VKD3D_SHADER_WARNING_HLSL_IMAGINARY_NUMERIC_RESULT, + "Floating point division by zero."); + } + dst->u[k].f = 1.0f / sqrtf(src->value.u[k].f); + if (ctx->profile->major_version < 4 && !isfinite(dst->u[k].f)) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_NON_FINITE_RESULT, + "Infinities and NaNs are not allowed by the shader model."); + } + break; + + default: + FIXME("Fold 'rsq' for type %s.\n", debug_hlsl_type(ctx, dst_type)); + return false; + } + } + + return true; +} + static bool fold_sat(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src) { @@ -1213,6 +1253,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, success = fold_rcp(ctx, &res, instr->data_type, arg1, &instr->loc); break; + case HLSL_OP1_RSQ: + success = fold_rsq(ctx, &res, instr->data_type, arg1, &instr->loc); + break; + case HLSL_OP1_SAT: success = fold_sat(ctx, &res, instr->data_type, arg1); break;

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add constant folding for binary complement operator.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: vkd3d Branch: master Commit: a58c659b10ecca32ade08c3f3d114ad25303c9e6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a58c659b10ecca32ade08c3f3d114… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 23 19:21:42 2023 +0200 vkd3d-shader/hlsl: Add constant folding for binary complement operator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 3e8c3fc1..c9554fd5 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -113,6 +113,32 @@ static int32_t double_to_int(double x) return x; } +static bool fold_bit_not(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, + const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src) +{ + enum hlsl_base_type type = dst_type->base_type; + unsigned int k; + + assert(type == src->node.data_type->base_type); + + for (k = 0; k < dst_type->dimx; ++k) + { + switch (type) + { + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + case HLSL_TYPE_BOOL: + dst->u[k].u = ~src->value.u[k].u; + break; + + default: + vkd3d_unreachable(); + } + } + + return true; +} + static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src) { @@ -1155,6 +1181,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, success = fold_abs(ctx, &res, instr->data_type, arg1); break; + case HLSL_OP1_BIT_NOT: + success = fold_bit_not(ctx, &res, instr->data_type, arg1); + break; + case HLSL_OP1_CAST: success = fold_cast(ctx, &res, instr->data_type, arg1); break;

1 0