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

Joel Holdsworth : ntdll: Initial implementation of FileDispositionInformationEx.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: cc1d0e493d52741b05204fd371805a7d42be85b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/cc1d0e493d52741b05204fd371805a… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Mon May 1 11:41:53 2023 +0100 ntdll: Initial implementation of FileDispositionInformationEx. This is required by Msys2 when running gpg-agent. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54996 Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/unix/file.c | 27 ++++++++++++++++++++++++++- dlls/wow64/file.c | 1 + include/wine/server_protocol.h | 4 ++-- server/fd.c | 8 ++++---- server/protocol.def | 2 +- server/request.h | 2 +- server/trace.c | 2 +- 7 files changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index aba4e1c694b..56b59413327 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4755,7 +4755,32 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, SERVER_START_REQ( set_fd_disp_info ) { req->handle = wine_server_obj_handle( handle ); - req->unlink = info->DoDeleteFile; + req->flags = info->DoDeleteFile ? FILE_DISPOSITION_DELETE : FILE_DISPOSITION_DO_NOT_DELETE; + status = wine_server_call( req ); + } + SERVER_END_REQ; + } + else status = STATUS_INVALID_PARAMETER_3; + break; + + case FileDispositionInformationEx: + if (len >= sizeof(FILE_DISPOSITION_INFORMATION_EX)) + { + FILE_DISPOSITION_INFORMATION_EX *info = ptr; + + if (info->Flags & FILE_DISPOSITION_POSIX_SEMANTICS) + FIXME( "FILE_DISPOSITION_POSIX_SEMANTICS not supported\n" ); + if (info->Flags & FILE_DISPOSITION_FORCE_IMAGE_SECTION_CHECK) + FIXME( "FILE_DISPOSITION_FORCE_IMAGE_SECTION_CHECK not supported\n" ); + if (info->Flags & FILE_DISPOSITION_ON_CLOSE) + FIXME( "FILE_DISPOSITION_ON_CLOSE not supported\n" ); + if (info->Flags & FILE_DISPOSITION_IGNORE_READONLY_ATTRIBUTE) + FIXME( "FILE_DISPOSITION_IGNORE_READONLY_ATTRIBUTE not supported\n" ); + + SERVER_START_REQ( set_fd_disp_info ) + { + req->handle = wine_server_obj_handle( handle ); + req->flags = info->Flags; status = wine_server_call( req ); } SERVER_END_REQ; diff --git a/dlls/wow64/file.c b/dlls/wow64/file.c index d32ef0b5455..fc867f79f28 100644 --- a/dlls/wow64/file.c +++ b/dlls/wow64/file.c @@ -787,6 +787,7 @@ NTSTATUS WINAPI wow64_NtSetInformationFile( UINT *args ) case FileIoPriorityHintInformation: /* FILE_IO_PRIORITY_HINT_INFO */ case FileValidDataLengthInformation: /* FILE_VALID_DATA_LENGTH_INFORMATION */ case FileDispositionInformation: /* FILE_DISPOSITION_INFORMATION */ + case FileDispositionInformationEx: /* FILE_DISPOSITION_INFORMATION_EX */ status = NtSetInformationFile( handle, iosb_32to64( &io, io32 ), ptr, len, class ); break; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d765697277b..1701a3e0420 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5230,7 +5230,7 @@ struct set_fd_disp_info_request { struct request_header __header; obj_handle_t handle; - int unlink; + unsigned int flags; char __pad_20[4]; }; struct set_fd_disp_info_reply @@ -6418,7 +6418,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 777 +#define SERVER_PROTOCOL_VERSION 778 /* ### protocol_version end ### */ diff --git a/server/fd.c b/server/fd.c index eaebe044f37..9388d36dcfd 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2463,7 +2463,7 @@ static int is_dir_empty( int fd ) } /* set disposition for the fd */ -static void set_fd_disposition( struct fd *fd, int unlink ) +static void set_fd_disposition( struct fd *fd, unsigned int flags ) { struct stat st; @@ -2479,7 +2479,7 @@ static void set_fd_disposition( struct fd *fd, int unlink ) return; } - if (unlink) + if (flags & FILE_DISPOSITION_DELETE) { struct fd *fd_ptr; @@ -2524,7 +2524,7 @@ static void set_fd_disposition( struct fd *fd, int unlink ) } } - fd->closed->unlink = unlink ? 1 : 0; + fd->closed->unlink = (flags & FILE_DISPOSITION_DELETE) ? 1 : 0; if (fd->options & FILE_DELETE_ON_CLOSE) fd->closed->unlink = -1; } @@ -2955,7 +2955,7 @@ DECL_HANDLER(set_fd_disp_info) struct fd *fd = get_handle_fd_obj( current->process, req->handle, DELETE ); if (fd) { - set_fd_disposition( fd, req->unlink ); + set_fd_disposition( fd, req->flags ); release_object( fd ); } } diff --git a/server/protocol.def b/server/protocol.def index 54059b6b580..b690817ef1d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3641,7 +3641,7 @@ struct handle_info /* set fd disposition information */ @REQ(set_fd_disp_info) obj_handle_t handle; /* handle to a file or directory */ - int unlink; /* whether to unlink file on close */ + unsigned int flags; /* what actions should be taken when deleting a file */ @END diff --git a/server/request.h b/server/request.h index 20e27ebdce1..0e54dc30b85 100644 --- a/server/request.h +++ b/server/request.h @@ -2207,7 +2207,7 @@ C_ASSERT( FIELD_OFFSET(struct set_fd_completion_mode_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_fd_completion_mode_request, flags) == 16 ); C_ASSERT( sizeof(struct set_fd_completion_mode_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_fd_disp_info_request, handle) == 12 ); -C_ASSERT( FIELD_OFFSET(struct set_fd_disp_info_request, unlink) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_fd_disp_info_request, flags) == 16 ); C_ASSERT( sizeof(struct set_fd_disp_info_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_fd_name_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_fd_name_info_request, rootdir) == 16 ); diff --git a/server/trace.c b/server/trace.c index 4dbc5de352f..4242e70a835 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4360,7 +4360,7 @@ static void dump_set_fd_completion_mode_request( const struct set_fd_completion_ static void dump_set_fd_disp_info_request( const struct set_fd_disp_info_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", unlink=%d", req->unlink ); + fprintf( stderr, ", flags=%08x", req->flags ); } static void dump_set_fd_name_info_request( const struct set_fd_name_info_request *req )

1 0

Joel Holdsworth : include: Define FILE_DISPOSITION_INFORMATION_EX and friends.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: dedd130d9ecebef631ccb20eacb3ff85fae01040 URL: https://gitlab.winehq.org/wine/wine/-/commit/dedd130d9ecebef631ccb20eacb3ff… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Mon May 1 13:44:00 2023 +0100 include: Define FILE_DISPOSITION_INFORMATION_EX and friends. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/unix/file.c | 1 + include/winternl.h | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index ff1618f31fd..aba4e1c694b 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4336,6 +4336,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, 0, /* FileReplaceCompletionInformation */ 0, /* FileHardLinkFullIdInformation */ 0, /* FileIdExtdBothDirectoryInformation */ + 0, /* FileDispositionInformationEx */ }; struct stat st; diff --git a/include/winternl.h b/include/winternl.h index 455e199f3e1..59b04faeceb 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1255,6 +1255,19 @@ typedef enum _FILE_INFORMATION_CLASS { FileReplaceCompletionInformation, FileHardLinkFullIdInformation, FileIdExtdBothDirectoryInformation, + FileDispositionInformationEx, + FileRenameInformationEx, + FileRenameInformationExBypassAccessCheck, + FileDesiredStorageClassInformation, + FileStatInformation, + FileMemoryPartitionInformation, + FileStatLxInformation, + FileCaseSensitiveInformation, + FileLinkInformationEx, + FileLinkInformationExBypassAccessCheck, + FileStorageReserveIdInformation, + FileCaseSensitiveInformationForceAccessCheck, + FileKnownFolderInformation, FileMaximumInformation } FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS; @@ -1424,6 +1437,17 @@ typedef struct _FILE_DISPOSITION_INFORMATION { BOOLEAN DoDeleteFile; } FILE_DISPOSITION_INFORMATION, *PFILE_DISPOSITION_INFORMATION; +typedef struct _FILE_DISPOSITION_INFORMATION_EX { + ULONG Flags; +} FILE_DISPOSITION_INFORMATION_EX, *PFILE_DISPOSITION_INFORMATION_EX; + +#define FILE_DISPOSITION_DO_NOT_DELETE 0x00000000 +#define FILE_DISPOSITION_DELETE 0x00000001 +#define FILE_DISPOSITION_POSIX_SEMANTICS 0x00000002 +#define FILE_DISPOSITION_FORCE_IMAGE_SECTION_CHECK 0x00000004 +#define FILE_DISPOSITION_ON_CLOSE 0x00000008 +#define FILE_DISPOSITION_IGNORE_READONLY_ATTRIBUTE 0x00000010 + typedef struct _FILE_POSITION_INFORMATION { LARGE_INTEGER CurrentByteOffset; } FILE_POSITION_INFORMATION, *PFILE_POSITION_INFORMATION;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fold logical expressions.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: vkd3d Branch: master Commit: bdfec4886da209d60a532656ebee4b05ec307425 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bdfec4886da209d60a532656ebee4… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 9 22:39:25 2023 +0200 vkd3d-shader/hlsl: Fold logical expressions. --- libs/vkd3d-shader/hlsl_constant_ops.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index b9bca0d3..570773cd 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -223,7 +223,7 @@ static bool fold_add(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons return true; } -static bool fold_bit_and(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, +static bool fold_and(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) { enum hlsl_base_type type = dst_type->base_type; @@ -238,18 +238,19 @@ static bool fold_bit_and(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, { case HLSL_TYPE_INT: case HLSL_TYPE_UINT: + case HLSL_TYPE_BOOL: dst->u[k].u = src1->value.u[k].u & src2->value.u[k].u; break; default: - FIXME("Fold bit and for type %s.\n", debug_hlsl_type(ctx, dst_type)); + FIXME("Fold bit/logic and for type %s.\n", debug_hlsl_type(ctx, dst_type)); return false; } } return true; } -static bool fold_bit_or(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, +static bool fold_or(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) { enum hlsl_base_type type = dst_type->base_type; @@ -264,11 +265,12 @@ static bool fold_bit_or(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, c { case HLSL_TYPE_INT: case HLSL_TYPE_UINT: + case HLSL_TYPE_BOOL: dst->u[k].u = src1->value.u[k].u | src2->value.u[k].u; break; default: - FIXME("Fold bit or for type %s.\n", debug_hlsl_type(ctx, dst_type)); + FIXME("Fold bit/logic or for type %s.\n", debug_hlsl_type(ctx, dst_type)); return false; } } @@ -724,11 +726,13 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, break; case HLSL_OP2_BIT_AND: - success = fold_bit_and(ctx, &res, instr->data_type, arg1, arg2); + case HLSL_OP2_LOGIC_AND: + success = fold_and(ctx, &res, instr->data_type, arg1, arg2); break; case HLSL_OP2_BIT_OR: - success = fold_bit_or(ctx, &res, instr->data_type, arg1, arg2); + case HLSL_OP2_LOGIC_OR: + success = fold_or(ctx, &res, instr->data_type, arg1, arg2); break; case HLSL_OP2_BIT_XOR:

1 0

Nikolay Sivov : tests: Add another test for register reservation.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: vkd3d Branch: master Commit: 3aee386e2fdf2e0bf65e7006a380f204a1e571f4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3aee386e2fdf2e0bf65e7006a380f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 25 23:03:53 2023 +0200 tests: Add another test for register reservation. --- tests/register-reservations.shader_test | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/register-reservations.shader_test b/tests/register-reservations.shader_test index 26f4381d..d885b209 100644 --- a/tests/register-reservations.shader_test +++ b/tests/register-reservations.shader_test @@ -142,3 +142,17 @@ float4 main() : sv_target [test] draw quad probe all rgba (2.0, 2.0, 2.0, 99.0) + + +[pixel shader todo] +Texture2D tex1 : register(t2); +Texture2D tex2 : register(t2); + +float4 main() : sv_target +{ + return tex2.Load(int3(0, 0, 0)); +} + +[test] +todo draw quad +probe all rgba (2.0, 2.0, 2.0, 99.0)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fold floating point minimum expressions.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: vkd3d Branch: master Commit: 5a05fabe6299f60d942f18189ce5d53afe6774b1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5a05fabe6299f60d942f18189ce5d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 9 22:30:56 2023 +0200 vkd3d-shader/hlsl: Fold floating point minimum expressions. --- libs/vkd3d-shader/hlsl_constant_ops.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index edfc898e..b9bca0d3 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -535,6 +535,15 @@ static bool fold_min(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons { switch (type) { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->u[k].f = fminf(src1->value.u[k].f, src2->value.u[k].f); + break; + + case HLSL_TYPE_DOUBLE: + dst->u[k].d = fmin(src1->value.u[k].d, src2->value.u[k].d); + break; + case HLSL_TYPE_INT: dst->u[k].i = min(src1->value.u[k].i, src2->value.u[k].i); break;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fold floating point maximum expressions.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: vkd3d Branch: master Commit: 2a2943c2cf962c90eda6732288b6bd0c3c873050 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2a2943c2cf962c90eda6732288b6b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 9 22:30:12 2023 +0200 vkd3d-shader/hlsl: Fold floating point maximum expressions. --- libs/vkd3d-shader/hlsl_constant_ops.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 00bacbf5..edfc898e 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -497,6 +497,15 @@ static bool fold_max(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons { switch (type) { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->u[k].f = fmaxf(src1->value.u[k].f, src2->value.u[k].f); + break; + + case HLSL_TYPE_DOUBLE: + dst->u[k].d = fmax(src1->value.u[k].d, src2->value.u[k].d); + break; + case HLSL_TYPE_INT: dst->u[k].i = max(src1->value.u[k].i, src2->value.u[k].i); break;

1 0

Zebediah Figura : tests: Use compare_uint() in compare_float().
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: vkd3d Branch: master Commit: 69ecfdfb0bf9e5fddc3b74732f7db94e4948f24e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/69ecfdfb0bf9e5fddc3b74732f7db… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 23 15:36:26 2023 -0500 tests: Use compare_uint() in compare_float(). Comparing the result of abs() is broken in the case that x - y == INT_MIN. --- tests/d3d12_test_utils.h | 7 ------- tests/utils.h | 12 ++++++++---- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 19105e19..ec5ba5c5 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -74,13 +74,6 @@ static void set_viewport(D3D12_VIEWPORT *vp, float x, float y, vp->MaxDepth = max_depth; } -static bool compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) -{ - unsigned int diff = x > y ? x - y : y - x; - - return diff <= max_diff; -} - static bool compare_color(DWORD c1, DWORD c2, BYTE max_diff) { return compare_uint(c1 & 0xff, c2 & 0xff, max_diff) diff --git a/tests/utils.h b/tests/utils.h index 5fd7b086..67094190 100644 --- a/tests/utils.h +++ b/tests/utils.h @@ -82,6 +82,13 @@ static inline bool vkd3d_array_reserve(void **elements, size_t *capacity, size_t return true; } +static bool compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + static bool compare_float(float f, float g, unsigned int ulps) { int x, y; @@ -101,10 +108,7 @@ static bool compare_float(float f, float g, unsigned int ulps) if (y < 0) y = INT_MIN - y; - if (abs(x - y) > ulps) - return false; - - return true; + return compare_uint(x, y, ulps); } static inline bool compare_uvec4(const struct uvec4 *v1, const struct uvec4 *v2)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fold equality comparisons.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: vkd3d Branch: master Commit: 488af1414431692eb16b1b43701db739198f9f15 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/488af1414431692eb16b1b43701db… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 9 22:23:40 2023 +0200 vkd3d-shader/hlsl: Fold equality comparisons. --- libs/vkd3d-shader/hlsl_constant_ops.c | 40 +++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 1ae338fe..6ba059fa 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -370,6 +370,42 @@ static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons return true; } +static bool fold_equal(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, + const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) +{ + unsigned int k; + + assert(dst_type->base_type == HLSL_TYPE_BOOL); + assert(src1->node.data_type->base_type == src2->node.data_type->base_type); + + for (k = 0; k < 4; ++k) + { + switch (src1->node.data_type->base_type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->u[k].u = src1->value.u[k].f == src2->value.u[k].f; + break; + + case HLSL_TYPE_DOUBLE: + dst->u[k].u = src1->value.u[k].d == src2->value.u[k].d; + break; + + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + case HLSL_TYPE_BOOL: + dst->u[k].u = src1->value.u[k].u == src2->value.u[k].u; + break; + + default: + vkd3d_unreachable(); + } + + dst->u[k].u *= ~0u; + } + return true; +} + static bool fold_max(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) { @@ -607,6 +643,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, success = fold_div(ctx, &res, instr->data_type, arg1, arg2, &instr->loc); break; + case HLSL_OP2_EQUAL: + success = fold_equal(ctx, &res, instr->data_type, arg1, arg2); + break; + case HLSL_OP2_MAX: success = fold_max(ctx, &res, instr->data_type, arg1, arg2); break;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fold less-than comparisons.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: vkd3d Branch: master Commit: bf452b5907df5f4e92a73ba817c084709f7b5c73 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bf452b5907df5f4e92a73ba817c08… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 9 22:25:51 2023 +0200 vkd3d-shader/hlsl: Fold less-than comparisons. --- libs/vkd3d-shader/hlsl_constant_ops.c | 43 +++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 6ba059fa..9232cd77 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -406,6 +406,45 @@ static bool fold_equal(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, co return true; } +static bool fold_less(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, + const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) +{ + unsigned int k; + + assert(dst_type->base_type == HLSL_TYPE_BOOL); + assert(src1->node.data_type->base_type == src2->node.data_type->base_type); + + for (k = 0; k < 4; ++k) + { + switch (src1->node.data_type->base_type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->u[k].u = src1->value.u[k].f < src2->value.u[k].f; + break; + + case HLSL_TYPE_DOUBLE: + dst->u[k].u = src1->value.u[k].d < src2->value.u[k].d; + break; + + case HLSL_TYPE_INT: + dst->u[k].u = src1->value.u[k].i < src2->value.u[k].i; + break; + + case HLSL_TYPE_UINT: + case HLSL_TYPE_BOOL: + dst->u[k].u = src1->value.u[k].u < src2->value.u[k].u; + break; + + default: + vkd3d_unreachable(); + } + + dst->u[k].u *= ~0u; + } + return true; +} + static bool fold_max(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) { @@ -647,6 +686,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, success = fold_equal(ctx, &res, instr->data_type, arg1, arg2); break; + case HLSL_OP2_LESS: + success = fold_less(ctx, &res, instr->data_type, arg1, arg2); + break; + case HLSL_OP2_MAX: success = fold_max(ctx, &res, instr->data_type, arg1, arg2); break;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fold greater-than-or-equal comparisons.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: vkd3d Branch: master Commit: 358d656262666de4a23bcb1f0675b2ac96a888ae URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/358d656262666de4a23bcb1f0675b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 9 22:27:03 2023 +0200 vkd3d-shader/hlsl: Fold greater-than-or-equal comparisons. --- libs/vkd3d-shader/hlsl_constant_ops.c | 43 +++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 9232cd77..00bacbf5 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -406,6 +406,45 @@ static bool fold_equal(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, co return true; } +static bool fold_gequal(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, + const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) +{ + unsigned int k; + + assert(dst_type->base_type == HLSL_TYPE_BOOL); + assert(src1->node.data_type->base_type == src2->node.data_type->base_type); + + for (k = 0; k < 4; ++k) + { + switch (src1->node.data_type->base_type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->u[k].u = src1->value.u[k].f >= src2->value.u[k].f; + break; + + case HLSL_TYPE_DOUBLE: + dst->u[k].u = src1->value.u[k].d >= src2->value.u[k].d; + break; + + case HLSL_TYPE_INT: + dst->u[k].u = src1->value.u[k].i >= src2->value.u[k].i; + break; + + case HLSL_TYPE_UINT: + case HLSL_TYPE_BOOL: + dst->u[k].u = src1->value.u[k].u >= src2->value.u[k].u; + break; + + default: + vkd3d_unreachable(); + } + + dst->u[k].u *= ~0u; + } + return true; +} + static bool fold_less(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) { @@ -686,6 +725,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, success = fold_equal(ctx, &res, instr->data_type, arg1, arg2); break; + case HLSL_OP2_GEQUAL: + success = fold_gequal(ctx, &res, instr->data_type, arg1, arg2); + break; + case HLSL_OP2_LESS: success = fold_less(ctx, &res, instr->data_type, arg1, arg2); break;

1 0