March 2024 - Wine-commits - list.winehq.org

Jinoh Kang : ntdll: Implement NtMakePermanentObject.
by Alexandre Julliard 15 Mar '24

15 Mar '24

Module: wine Branch: master Commit: ce41edab3feebba814d0504436af079f1aa341bd URL: https://gitlab.winehq.org/wine/wine/-/commit/ce41edab3feebba814d0504436af07… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Mar 11 21:48:19 2024 +0900 ntdll: Implement NtMakePermanentObject. --- dlls/ntdll/ntdll.spec | 4 +- dlls/ntdll/ntsyscalls.h | 592 ++++++++++++++++++------------------ dlls/ntdll/signal_arm64ec.c | 5 + dlls/ntdll/tests/om.c | 37 +++ dlls/ntdll/unix/sync.c | 20 ++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/wow64/sync.c | 11 + include/winternl.h | 1 + 8 files changed, 374 insertions(+), 298 deletions(-)

1 0

Alexandre Julliard : include: Add some new error codes.
by Alexandre Julliard 15 Mar '24

15 Mar '24

Module: wine Branch: master Commit: 98b7095a21688b38eabbab31ecc795bd93005558 URL: https://gitlab.winehq.org/wine/wine/-/commit/98b7095a21688b38eabbab31ecc795… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 15 11:17:39 2024 +0100 include: Add some new error codes. And sort everything consistently. --- dlls/jscript/jscript.h | 2 - include/d3d10.idl | 2 - include/dmerror.h | 1 - include/webservices.h | 3 + include/winerror.h | 4196 +++++++++++++++++++++++++++++++++++++++++++----- include/winsock2.h | 8 +- 6 files changed, 3782 insertions(+), 430 deletions(-)

1 0

Alexandre Julliard : include: Add some new status codes.
by Alexandre Julliard 15 Mar '24

15 Mar '24

Module: wine Branch: master Commit: 08f46b8de08310890df29cbb014f79f978477f12 URL: https://gitlab.winehq.org/wine/wine/-/commit/08f46b8de08310890df29cbb014f79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 15 12:39:12 2024 +0100 include: Add some new status codes. And sort everything consistently. --- include/ntstatus.h | 1472 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 1337 insertions(+), 135 deletions(-)

1 0

Alexandre Julliard : ntdll: Add mappings for more status codes.
by Alexandre Julliard 15 Mar '24

15 Mar '24

Module: wine Branch: master Commit: 72fd6e925179ee064f9535c34e3f621822a8d97d URL: https://gitlab.winehq.org/wine/wine/-/commit/72fd6e925179ee064f9535c34e3f62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 15 14:28:31 2024 +0100 ntdll: Add mappings for more status codes. --- dlls/ntdll/error.h | 1744 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/make_errors | 1382 +++++++++++++++++++++++++++++++++++++- 2 files changed, 3076 insertions(+), 50 deletions(-)

1 0

Jinoh Kang : ntdll/tests: Add tests for OBJ_PERMANENT object attribute.
by Alexandre Julliard 15 Mar '24

15 Mar '24

Module: wine Branch: master Commit: a4ad64dda303e887d0ffc5e50a02db2af83e05db URL: https://gitlab.winehq.org/wine/wine/-/commit/a4ad64dda303e887d0ffc5e50a02db… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Mar 11 21:48:19 2024 +0900 ntdll/tests: Add tests for OBJ_PERMANENT object attribute. --- dlls/ntdll/tests/om.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 62659fc8cb4..e9ba93890c1 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -3156,6 +3156,131 @@ static void test_null_in_object_name(void) skip("Limited access to \\Registry\\Machine\\Software key, skipping the tests\n"); } +static void test_object_permanence(void) +{ + static const struct object_permanence_test { + const char *name; + ULONG initial_attr; + } tests[] = { + { + .name = "permanent object persists", + .initial_attr = OBJ_PERMANENT, + }, + { + .name = "temporary object disappears", + .initial_attr = 0, + }, + }; + const struct object_permanence_test *test; + HANDLE process_token = NULL, thread_token = NULL; + SECURITY_QUALITY_OF_SERVICE token_qos = { + .Length = sizeof(token_qos), + .ImpersonationLevel = SecurityDelegation, + .ContextTrackingMode = SECURITY_STATIC_TRACKING, + .EffectiveOnly = FALSE, + }; + OBJECT_ATTRIBUTES token_attr = { + .Length = sizeof(token_attr), + .SecurityQualityOfService = &token_qos, + }; + TOKEN_PRIVILEGES new_privs = { + .PrivilegeCount = 1, + .Privileges = { + { + .Luid = { .LowPart = SE_CREATE_PERMANENT_PRIVILEGE }, + .Attributes = SE_PRIVILEGE_ENABLED, + }, + }, + }; + NTSTATUS status; + BOOL creatpermapriv = FALSE; + + status = NtOpenProcessToken( GetCurrentProcess(), TOKEN_DUPLICATE, &process_token ); + ok( status == STATUS_SUCCESS, "NtOpenProcessToken returned %08lx\n", status ); + + status = NtDuplicateToken( process_token, TOKEN_IMPERSONATE | TOKEN_ADJUST_PRIVILEGES, + &token_attr, FALSE, TokenImpersonation, &thread_token ); + ok( status == STATUS_SUCCESS, "NtDuplicateToken returned %08lx\n", status ); + NtClose( process_token ); + + status = NtAdjustPrivilegesToken( thread_token, FALSE, &new_privs, sizeof(new_privs), NULL, NULL ); + ok( status == STATUS_SUCCESS || status == STATUS_NOT_ALL_ASSIGNED, "NtAdjustPrivilegesToken returned %08lx\n", status ); + creatpermapriv = (status == STATUS_SUCCESS); + + status = NtSetInformationThread( GetCurrentThread(), ThreadImpersonationToken, &thread_token, sizeof(thread_token) ); + ok( status == STATUS_SUCCESS, "NtSetInformationThread returned %08lx\n", status ); + NtClose( thread_token ); + + if (!creatpermapriv) skip( "no privileges, tests may be limited\n" ); + + for (test = &tests[0]; test != &tests[ARRAY_SIZE(tests)]; test++) + { + NTSTATUS make_perma_status = creatpermapriv ? STATUS_SUCCESS : STATUS_PRIVILEGE_NOT_HELD; + HANDLE handle; + OBJECT_BASIC_INFORMATION obi; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING name; + BOOL is_permanent; + ULONG len = 0; + + winetest_push_context( "test#%Iu", test - &tests[0] ); + trace( "(%s)\n", test->name ); + + RtlInitUnicodeString( &name, L"\\BaseNamedObjects\\test_object_permanence" ); + InitializeObjectAttributes( &attr, &name, test->initial_attr, 0, NULL ); + status = NtCreateEvent( &handle, GENERIC_ALL, &attr, NotificationEvent, FALSE ); + if (test->initial_attr & OBJ_PERMANENT) + { + todo_wine_if(status == STATUS_SUCCESS || status == STATUS_PRIVILEGE_NOT_HELD) + ok( status == make_perma_status, "NtCreateEvent returned %08lx (expected %08lx)\n", status, make_perma_status ); + } + else + { + ok( status == STATUS_SUCCESS, "NtCreateEvent returned %08lx\n", status ); + } + if (NT_ERROR(status)) + { + winetest_pop_context(); + continue; + } + is_permanent = (test->initial_attr & OBJ_PERMANENT) != 0; + + status = NtQueryObject( handle, ObjectBasicInformation, &obi, sizeof(obi), &len ); + ok( status == STATUS_SUCCESS, "NtQueryObject returned %08lx\n", status ); + todo_wine_if(test->initial_attr != 0) + ok( obi.Attributes == test->initial_attr, "expected attr %08lx, got %08lx\n", test->initial_attr, obi.Attributes ); + + if (winetest_debug > 1) + trace( "NOTE: about to close earlier handle (%p) which should be the last", handle ); + NtClose( handle ); + + winetest_push_context( "first handle closed" ); + status = NtOpenEvent( &handle, GENERIC_ALL, &attr ); + ok( status == (is_permanent ? STATUS_SUCCESS : STATUS_OBJECT_NAME_NOT_FOUND), "NtOpenEvent returned %08lx\n", status ); + if (!NT_ERROR(status)) + { + ULONG expect_attr = obi.Attributes; + OBJECT_BASIC_INFORMATION obi_new; + + status = NtQueryObject( handle, ObjectBasicInformation, &obi_new, sizeof(obi_new), &len ); + ok( status == STATUS_SUCCESS, "NtQueryObject returned %08lx\n", status ); + todo_wine_if(expect_attr != 0) + ok( obi_new.Attributes == expect_attr, "expected attr %08lx, got %08lx\n", expect_attr, obi_new.Attributes ); + + /* ensure object is deleted */ + NtMakeTemporaryObject( handle ); + NtClose( handle ); + } + winetest_pop_context(); + + winetest_pop_context(); + } + + thread_token = NULL; + status = NtSetInformationThread( GetCurrentThread(), ThreadImpersonationToken, &thread_token, sizeof(thread_token) ); + ok( status == STATUS_SUCCESS, "NtSetInformationThread returned %08lx\n", status ); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -3219,4 +3344,5 @@ START_TEST(om) test_globalroot(); test_object_identity(); test_query_directory(); + test_object_permanence(); }

1 0

Jinoh Kang : ntdll/tests: Add tests for NtMakeTemporaryObject.
by Alexandre Julliard 15 Mar '24

15 Mar '24

Module: wine Branch: master Commit: d282208ac3840de97258871a214948d1d0ce82c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/d282208ac3840de97258871a214948… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Mar 11 23:32:53 2024 +0900 ntdll/tests: Add tests for NtMakeTemporaryObject. --- dlls/ntdll/tests/om.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 70 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index e9ba93890c1..ee511cb6afb 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -3161,14 +3161,48 @@ static void test_object_permanence(void) static const struct object_permanence_test { const char *name; ULONG initial_attr; + ACCESS_MASK access; + BOOLEAN make_temporary; + NTSTATUS make_temp_status; } tests[] = { { .name = "permanent object persists", .initial_attr = OBJ_PERMANENT, + .access = GENERIC_ALL, }, + { + .name = "NtMakeTemporaryObject() succeeds", + .initial_attr = OBJ_PERMANENT, + .access = GENERIC_ALL, + .make_temporary = TRUE, + .make_temp_status = STATUS_SUCCESS, + }, + { + .name = "NtMakeTemporaryObject() fails w/o DELETE access", + .initial_attr = OBJ_PERMANENT, + .access = EVENT_ALL_ACCESS & ~DELETE, + .make_temporary = TRUE, + .make_temp_status = STATUS_ACCESS_DENIED, + }, + { .name = "temporary object disappears", .initial_attr = 0, + .access = GENERIC_ALL, + }, + { + .name = "NtMakeTemporaryObject() succeeds even if already temporary", + .initial_attr = 0, + .access = GENERIC_ALL, + .make_temporary = TRUE, + .make_temp_status = STATUS_SUCCESS, + }, + { + .name = "NtMakeTemporaryObject() fails w/o DELETE access even if already temporary", + .initial_attr = 0, + .access = EVENT_ALL_ACCESS & ~DELETE, + .make_temporary = TRUE, + .make_temp_status = STATUS_ACCESS_DENIED, }, }; const struct object_permanence_test *test; @@ -3216,7 +3250,7 @@ static void test_object_permanence(void) for (test = &tests[0]; test != &tests[ARRAY_SIZE(tests)]; test++) { NTSTATUS make_perma_status = creatpermapriv ? STATUS_SUCCESS : STATUS_PRIVILEGE_NOT_HELD; - HANDLE handle; + HANDLE handle, handle2; OBJECT_BASIC_INFORMATION obi; OBJECT_ATTRIBUTES attr; UNICODE_STRING name; @@ -3228,7 +3262,7 @@ static void test_object_permanence(void) RtlInitUnicodeString( &name, L"\\BaseNamedObjects\\test_object_permanence" ); InitializeObjectAttributes( &attr, &name, test->initial_attr, 0, NULL ); - status = NtCreateEvent( &handle, GENERIC_ALL, &attr, NotificationEvent, FALSE ); + status = NtCreateEvent( &handle, test->access, &attr, NotificationEvent, FALSE ); if (test->initial_attr & OBJ_PERMANENT) { todo_wine_if(status == STATUS_SUCCESS || status == STATUS_PRIVILEGE_NOT_HELD) @@ -3250,6 +3284,39 @@ static void test_object_permanence(void) todo_wine_if(test->initial_attr != 0) ok( obi.Attributes == test->initial_attr, "expected attr %08lx, got %08lx\n", test->initial_attr, obi.Attributes ); + if (test->make_temporary) + { + if (test->make_temp_status == STATUS_ACCESS_DENIED) + ok( !(obi.GrantedAccess & DELETE), "expected no DELETE access in %08lx\n", obi.GrantedAccess ); + if (test->make_temp_status == STATUS_SUCCESS) + ok( !!(obi.GrantedAccess & DELETE), "expected DELETE access in %08lx\n", obi.GrantedAccess ); + + status = NtMakeTemporaryObject( handle ); + todo_wine_if(test->make_temp_status == STATUS_ACCESS_DENIED) + ok( status == test->make_temp_status, "NtMakeTemporaryObject returned %08lx\n", status ); + if (!NT_ERROR(status)) is_permanent = FALSE; + } + + if (winetest_debug > 1) + trace( "NOTE: object still has unclosed handle (%p) and shouldn't be deleted", handle ); + + winetest_push_context( "first handle (%p) still open", handle ); + status = NtOpenEvent( &handle2, GENERIC_ALL, &attr ); + ok( status == STATUS_SUCCESS, "NtOpenEvent returned %08lx\n", status ); + if (!NT_ERROR(status)) + { + ULONG expect_attr = (obi.Attributes & ~OBJ_PERMANENT) | (is_permanent ? OBJ_PERMANENT : 0); + OBJECT_BASIC_INFORMATION obi2; + + status = NtQueryObject( handle2, ObjectBasicInformation, &obi2, sizeof(obi2), &len ); + ok( status == STATUS_SUCCESS, "NtQueryObject returned %08lx\n", status ); + todo_wine_if(expect_attr != 0) + ok( obi2.Attributes == expect_attr, "expected attr %08lx, got %08lx\n", expect_attr, obi2.Attributes ); + + NtClose( handle2 ); + } + winetest_pop_context(); + if (winetest_debug > 1) trace( "NOTE: about to close earlier handle (%p) which should be the last", handle ); NtClose( handle ); @@ -3259,7 +3326,7 @@ static void test_object_permanence(void) ok( status == (is_permanent ? STATUS_SUCCESS : STATUS_OBJECT_NAME_NOT_FOUND), "NtOpenEvent returned %08lx\n", status ); if (!NT_ERROR(status)) { - ULONG expect_attr = obi.Attributes; + ULONG expect_attr = (obi.Attributes & ~OBJ_PERMANENT) | (is_permanent ? OBJ_PERMANENT : 0); OBJECT_BASIC_INFORMATION obi_new; status = NtQueryObject( handle, ObjectBasicInformation, &obi_new, sizeof(obi_new), &len );

1 0

Giovanni Mascellani : vkd3d-shader/ir: Dump the reconstructed structured program.
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: vkd3d Branch: master Commit: d75dc7601128325445210ae6f06bc52fef8ca76f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d75dc7601128325445210ae6f06bc… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Feb 6 15:08:49 2024 +0100 vkd3d-shader/ir: Dump the reconstructed structured program. --- libs/vkd3d-shader/ir.c | 73 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_main.c | 12 +++++- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 84 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 8c74f2b0..6e09b68c 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -3379,6 +3379,76 @@ static void vsir_cfg_dump_dot(struct vsir_cfg *cfg) TRACE("}\n"); } +static void vsir_cfg_structure_list_dump(struct vsir_cfg *cfg, struct vsir_cfg_structure_list *list); + +static void vsir_cfg_structure_dump(struct vsir_cfg *cfg, struct vsir_cfg_structure *structure) +{ + switch (structure->type) + { + case STRUCTURE_TYPE_BLOCK: + TRACE("%sblock %u\n", cfg->debug_buffer.buffer, structure->u.block->label); + break; + + case STRUCTURE_TYPE_LOOP: + TRACE("%s%u : loop {\n", cfg->debug_buffer.buffer, structure->u.loop.idx); + + vsir_cfg_structure_list_dump(cfg, &structure->u.loop.body); + + TRACE("%s} # %u\n", cfg->debug_buffer.buffer, structure->u.loop.idx); + break; + + case STRUCTURE_TYPE_JUMP: + { + const char *type_str; + + switch (structure->u.jump.type) + { + case JUMP_RET: + TRACE("%sret\n", cfg->debug_buffer.buffer); + return; + + case JUMP_BREAK: + type_str = "break"; + break; + + case JUMP_CONTINUE: + type_str = "continue"; + break; + + default: + vkd3d_unreachable(); + } + + TRACE("%s%s%s %u\n", cfg->debug_buffer.buffer, type_str, + structure->u.jump.condition ? "c" : "", structure->u.jump.target); + break; + } + + default: + vkd3d_unreachable(); + } +} + +static void vsir_cfg_structure_list_dump(struct vsir_cfg *cfg, struct vsir_cfg_structure_list *list) +{ + unsigned int i; + + vkd3d_string_buffer_printf(&cfg->debug_buffer, " "); + + for (i = 0; i < list->count; ++i) + vsir_cfg_structure_dump(cfg, &list->structures[i]); + + vkd3d_string_buffer_truncate(&cfg->debug_buffer, cfg->debug_buffer.content_size - 2); +} + +static void vsir_cfg_dump_structured_program(struct vsir_cfg *cfg) +{ + unsigned int i; + + for (i = 0; i < cfg->structured_program.count; ++i) + vsir_cfg_structure_dump(cfg, &cfg->structured_program.structures[i]); +} + static enum vkd3d_result vsir_cfg_init(struct vsir_cfg *cfg, struct vsir_program *program, struct vkd3d_shader_message_context *message_context) { @@ -4205,6 +4275,9 @@ static enum vkd3d_result vsir_cfg_build_structured_program(struct vsir_cfg *cfg) assert(stack_depth == 0); assert(open_interval_idx == cfg->loop_interval_count); + if (TRACE_ON()) + vsir_cfg_dump_structured_program(cfg); + vkd3d_free(stack); return VKD3D_OK; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index ff361a2b..12024306 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -73,8 +73,16 @@ void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) { - buffer->buffer[0] = '\0'; - buffer->content_size = 0; + vkd3d_string_buffer_truncate(buffer, 0); +} + +void vkd3d_string_buffer_truncate(struct vkd3d_string_buffer *buffer, size_t size) +{ + if (size < buffer->content_size) + { + buffer->buffer[size] = '\0'; + buffer->content_size = size; + } } static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index c540aee9..f4df32d6 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1417,6 +1417,7 @@ void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer); void vkd3d_string_buffer_cache_cleanup(struct vkd3d_string_buffer_cache *list); void vkd3d_string_buffer_cache_init(struct vkd3d_string_buffer_cache *list); void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer); +void vkd3d_string_buffer_truncate(struct vkd3d_string_buffer *buffer, size_t size); int vkd3d_string_buffer_print_f32(struct vkd3d_string_buffer *buffer, float f); int vkd3d_string_buffer_print_f64(struct vkd3d_string_buffer *buffer, double d); int vkd3d_string_buffer_printf(struct vkd3d_string_buffer *buffer, const char *format, ...) VKD3D_PRINTF_FUNC(2, 3);

1 0

Francisco Casas : vkd3d-shader/d3dbc: Check profiles before writing SLT and CMP.
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: vkd3d Branch: master Commit: 7b883eef531be97108afbbffd538cede2020940d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7b883eef531be97108afbbffd538c… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Feb 26 15:24:38 2024 -0300 vkd3d-shader/d3dbc: Check profiles before writing SLT and CMP. --- libs/vkd3d-shader/d3dbc.c | 4 ++++ libs/vkd3d-shader/hlsl.h | 1 + 2 files changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 57dd0258..3a815dc5 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2334,10 +2334,14 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b break; case HLSL_OP2_SLT: + if (ctx->profile->type == VKD3D_SHADER_TYPE_PIXEL) + hlsl_fixme(ctx, &instr->loc, "Lower SLT instructions for pixel shaders."); write_sm1_binary_op(ctx, buffer, D3DSIO_SLT, &instr->reg, &arg1->reg, &arg2->reg); break; case HLSL_OP3_CMP: + if (ctx->profile->type == VKD3D_SHADER_TYPE_VERTEX) + hlsl_fixme(ctx, &instr->loc, "Lower CMP instructions for vertex shaders."); write_sm1_ternary_op(ctx, buffer, D3DSIO_CMP, &instr->reg, &arg1->reg, &arg2->reg, &arg3->reg); break; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 9781dd33..9aae913a 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -594,6 +594,7 @@ enum hlsl_ir_expr_op HLSL_OP2_MUL, HLSL_OP2_NEQUAL, HLSL_OP2_RSHIFT, + /* SLT(a, b) retrieves 1.0 if (a < b), else 0.0. Only used for SM1-SM3 target vertex shaders. */ HLSL_OP2_SLT, /* DP2ADD(a, b, c) computes the scalar product of a.xy and b.xy,

1 0

Francisco Casas : vkd3d-shader/hlsl: Implement SM1 comparison operators.
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: vkd3d Branch: master Commit: e9a47586481608db480ad548af00f2d8a9a4b803 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e9a47586481608db480ad548af00f… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Feb 26 15:41:12 2024 -0300 vkd3d-shader/hlsl: Implement SM1 comparison operators. --- libs/vkd3d-shader/hlsl_codegen.c | 122 +++++++++++++++++++++++++++++++ tests/hlsl/vertex-shader-ops.shader_test | 10 +-- 2 files changed, 127 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 9eb65dc0..09c21f16 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -3020,6 +3020,127 @@ static bool lower_ternary(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, stru return true; } +static bool lower_comparison_operators(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, + struct hlsl_block *block) +{ + struct hlsl_ir_node *arg1, *arg1_cast, *arg2, *arg2_cast, *slt, *res, *ret; + struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS]; + struct hlsl_type *float_type; + struct hlsl_ir_expr *expr; + bool negate = false; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + if (expr->op != HLSL_OP2_EQUAL && expr->op != HLSL_OP2_NEQUAL && expr->op != HLSL_OP2_LESS + && expr->op != HLSL_OP2_GEQUAL) + return false; + + arg1 = expr->operands[0].node; + arg2 = expr->operands[1].node; + float_type = hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, instr->data_type->dimx); + + if (!(arg1_cast = hlsl_new_cast(ctx, arg1, float_type, &instr->loc))) + return false; + hlsl_block_add_instr(block, arg1_cast); + + if (!(arg2_cast = hlsl_new_cast(ctx, arg2, float_type, &instr->loc))) + return false; + hlsl_block_add_instr(block, arg2_cast); + + switch (expr->op) + { + case HLSL_OP2_EQUAL: + case HLSL_OP2_NEQUAL: + { + struct hlsl_ir_node *neg, *sub, *abs, *abs_neg; + + if (!(neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, arg2_cast, &instr->loc))) + return false; + hlsl_block_add_instr(block, neg); + + if (!(sub = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, arg1_cast, neg))) + return false; + hlsl_block_add_instr(block, sub); + + if (ctx->profile->major_version >= 3) + { + if (!(abs = hlsl_new_unary_expr(ctx, HLSL_OP1_ABS, sub, &instr->loc))) + return false; + hlsl_block_add_instr(block, abs); + } + else + { + /* Use MUL as a precarious ABS. */ + if (!(abs = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, sub, sub))) + return false; + hlsl_block_add_instr(block, abs); + } + + if (!(abs_neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, abs, &instr->loc))) + return false; + hlsl_block_add_instr(block, abs_neg); + + if (!(slt = hlsl_new_binary_expr(ctx, HLSL_OP2_SLT, abs_neg, abs))) + return false; + hlsl_block_add_instr(block, slt); + + negate = (expr->op == HLSL_OP2_EQUAL); + break; + } + + case HLSL_OP2_GEQUAL: + case HLSL_OP2_LESS: + { + if (!(slt = hlsl_new_binary_expr(ctx, HLSL_OP2_SLT, arg1_cast, arg2_cast))) + return false; + hlsl_block_add_instr(block, slt); + + negate = (expr->op == HLSL_OP2_GEQUAL); + break; + } + + default: + vkd3d_unreachable(); + } + + if (negate) + { + struct hlsl_constant_value one_value; + struct hlsl_ir_node *one, *slt_neg; + + one_value.u[0].f = 1.0; + one_value.u[1].f = 1.0; + one_value.u[2].f = 1.0; + one_value.u[3].f = 1.0; + if (!(one = hlsl_new_constant(ctx, float_type, &one_value, &instr->loc))) + return false; + hlsl_block_add_instr(block, one); + + if (!(slt_neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, slt, &instr->loc))) + return false; + hlsl_block_add_instr(block, slt_neg); + + if (!(res = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, one, slt_neg))) + return false; + hlsl_block_add_instr(block, res); + } + else + { + res = slt; + } + + /* We need a REINTERPRET so that the HLSL IR code is valid. SLT and its arguments must be FLOAT, + * and casts to BOOL have already been lowered to "!= 0". */ + memset(operands, 0, sizeof(operands)); + operands[0] = res; + if (!(ret = hlsl_new_expr(ctx, HLSL_OP1_REINTERPRET, operands, instr->data_type, &instr->loc))) + return false; + hlsl_block_add_instr(block, ret); + + return true; +} + static bool lower_casts_to_bool(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block) { struct hlsl_type *type = instr->data_type, *arg_type; @@ -5209,6 +5330,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry lower_ir(ctx, lower_round, body); lower_ir(ctx, lower_ceil, body); lower_ir(ctx, lower_floor, body); + lower_ir(ctx, lower_comparison_operators, body); } if (profile->major_version < 2) diff --git a/tests/hlsl/vertex-shader-ops.shader_test b/tests/hlsl/vertex-shader-ops.shader_test index 34d49672..38f3db65 100644 --- a/tests/hlsl/vertex-shader-ops.shader_test +++ b/tests/hlsl/vertex-shader-ops.shader_test @@ -15,7 +15,7 @@ float4 main(in float4 res : COLOR1) : sv_target % Check that -0.0f is not less than 0.0f -[vertex shader todo(sm<4)] +[vertex shader] float a; void main(out float4 res : COLOR1, in float4 pos : position, out float4 out_pos : sv_position) @@ -28,11 +28,11 @@ void main(out float4 res : COLOR1, in float4 pos : position, out float4 out_pos [test] if(sm<4) uniform 0 float 0.0 if(sm>=4) uniform 0 float4 0.0 0.0 0.0 0.0 -todo(sm<4) draw quad +draw quad probe all rgba (0.0, 0.0, 0.0, 0.0) -[vertex shader todo(sm<4)] +[vertex shader] int a, b; void main(out float4 res : COLOR1, in float4 pos : position, out float4 out_pos : sv_position) @@ -49,12 +49,12 @@ void main(out float4 res : COLOR1, in float4 pos : position, out float4 out_pos if(sm<4) uniform 0 float 3 if(sm<4) uniform 4 float 4 if(sm>=4) uniform 0 int4 3 4 0 0 -todo(sm<4) draw quad +draw quad probe all rgba (0.0, 1.0, 0.0, 1.0) if(sm<4) uniform 0 float -2 if(sm<4) uniform 4 float -2 if(sm>=4) uniform 0 int4 -2 -2 0 0 -todo(sm<4) draw quad +draw quad probe all rgba (1.0, 0.0, 0.0, 1.0)

1 0

Francisco Casas : tests: Test equality between tiny and between large numbers on ps_2_0.
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: vkd3d Branch: master Commit: 4133c4d801c31b35e8770bf7ad7125dc258123ea URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4133c4d801c31b35e8770bf7ad712… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Mar 12 14:53:29 2024 -0300 tests: Test equality between tiny and between large numbers on ps_2_0. --- tests/hlsl/float-comparison.shader_test | 47 +++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/tests/hlsl/float-comparison.shader_test b/tests/hlsl/float-comparison.shader_test index c351ac09..6062643d 100644 --- a/tests/hlsl/float-comparison.shader_test +++ b/tests/hlsl/float-comparison.shader_test @@ -64,6 +64,53 @@ if(sm>=4 & sm<6) todo probe all rgba (1010101.0, 0.0, 1101001.0, 1.0) if(sm>=6) probe all rgba (1010101.0, 11110000.0, 1101001.0, 1.0) +% In shader model 2.0, native compares two numbers for equality checking if (a - b)*(a - b) is +% positive instead of |a - b|. We check if this causes some changes in behavior for very small and +% very large numbers. +% For large numbers the behavior is the same, even though the multiplication reaches inf, but for +% very small ones it is not because the multiplication results in 0. +% +% NOTE: Seems that subnormal numbers are considered equal to zero, at least in the WARP driver. +% Probably this is implementation dependent and deserves separate testing, so only normal numbers +% are passed on these tests. +[require] +shader model >= 2.0 +shader model < 3.0 + +[pixel shader todo(sm<4)] +float4 a, b; + +float4 main() : sv_target +{ + return a == b; +} + +[test] +uniform 0 float4 1e-37 1e-37 1e+38 1e+38 +uniform 4 float4 0 -1e-37 1e+38 -1e+38 +todo(sm<4) draw quad +probe all rgba (1.0, 1.0, 1.0, 0.0) + + +[require] +shader model >= 3.0 +shader model < 4.0 + +[pixel shader todo(sm<4)] +float4 a, b; + +float4 main() : sv_target +{ + return a == b; +} + +[test] +uniform 0 float4 1e-37 1e-37 1e+38 1e+38 +uniform 4 float4 0 -1e-37 1e+38 -1e+38 +todo(sm<4) draw quad +probe all rgba (0.0, 0.0, 1.0, 0.0) + + [require] shader model >= 6.0

1 0