- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Directly access the syscall table variable on ARM64.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: ae291b1204f391b6b5d0c5b2ec12275ab0d1e456 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae291b1204f391b6b5d0c5b2ec1227… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 09:51:16 2023 +0100 ntdll: Directly access the syscall table variable on ARM64. --- dlls/ntdll/unix/signal_arm64.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index d9e35e32a51..e990d158537 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -137,7 +137,7 @@ struct syscall_frame ULONG cpsr; /* 108 */ ULONG restore_flags; /* 10c */ struct syscall_frame *prev_frame; /* 110 */ - SYSTEM_SERVICE_TABLE *syscall_table; /* 118 */ + void *unused; /* 118 */ ULONG64 align; /* 120 */ ULONG fpcr; /* 128 */ ULONG fpsr; /* 12c */ @@ -1132,9 +1132,8 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, "ldr x7, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ "sub x3, sp, #0x330\n\t" /* sizeof(struct syscall_frame) */ "str x3, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ - "ldr x8, [x7, #0x118]\n\t" /* prev_frame->syscall_table */ "mov sp, x1\n\t" /* stack */ - "stp x7, x8, [x3, #0x110]\n\t" /* frame->prev_frame, frame->syscall_table */ + "str x7, [x3, #0x110]\n\t" /* frame->prev_frame */ "br x5" ) @@ -1662,7 +1661,6 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB frame->prev_frame = NULL; frame->restore_flags |= CONTEXT_INTEGER; syscall_frame_fixup_for_fastpath( frame ); - frame->syscall_table = KeServiceDescriptorTable; pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); __wine_syscall_dispatcher_return( frame, 0 ); @@ -1736,7 +1734,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "mov sp, x10\n\t" "and x20, x8, #0xfff\n\t" /* syscall number */ "ubfx x21, x8, #12, #2\n\t" /* syscall table number */ - "ldr x16, [x10, #0x118]\n\t" /* frame->syscall_table */ + "adr x16, " __ASM_NAME("KeServiceDescriptorTable") "\n\t" "add x21, x16, x21, lsl #5\n\t" "ldr x16, [x21, #16]\n\t" /* table->ServiceLimit */ "cmp x20, x16\n\t"

1 0

Alexandre Julliard : ntdll: Store the syscall table in the TEB on i386.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: d4439fd92b5e782e7d1320a8a47af0a3535cb46c URL: https://gitlab.winehq.org/wine/wine/-/commit/d4439fd92b5e782e7d1320a8a47af0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 09:46:05 2023 +0100 ntdll: Store the syscall table in the TEB on i386. --- dlls/ntdll/unix/signal_i386.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 99592429a81..ba6bc38fe85 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -455,7 +455,7 @@ struct syscall_frame UINT edi; /* 02c */ UINT esi; /* 030 */ UINT ebp; /* 034 */ - SYSTEM_SERVICE_TABLE *syscall_table; /* 038 */ + void *unused; /* 038 */ struct syscall_frame *prev_frame; /* 03c */ union /* 040 */ { @@ -482,12 +482,14 @@ struct x86_thread_data UINT dr7; /* 1f0 */ void *exit_frame; /* 1f4 exit frame pointer */ struct syscall_frame *syscall_frame; /* 1f8 frame pointer on syscall entry */ + SYSTEM_SERVICE_TABLE *syscall_table; /* 1fc syscall table */ }; C_ASSERT( sizeof(struct x86_thread_data) <= sizeof(((struct ntdll_thread_data *)0)->cpu_data) ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, gs ) == 0x1d8 ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, exit_frame ) == 0x1f4 ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, syscall_frame ) == 0x1f8 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, syscall_table ) == 0x1fc ); /* flags to control the behavior of the syscall dispatcher */ #define SYSCALL_HAVE_XSAVE 1 @@ -1596,8 +1598,6 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, "movl 0x1f8(%edx),%ecx\n\t" /* x86_thread_data()->syscall_frame */ "movl (%ecx),%eax\n\t" /* frame->syscall_flags */ "movl %eax,(%esp)\n\t" - "movl 0x38(%ecx),%eax\n\t" /* frame->syscall_table */ - "movl %eax,0x38(%esp)\n\t" "movl %ecx,0x3c(%esp)\n\t" /* frame->prev_frame */ "movl %esp,0x1f8(%edx)\n\t" /* x86_thread_data()->syscall_frame */ "movl 0x1c(%ebp),%ecx\n\t" /* func */ @@ -2423,6 +2423,7 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB ldt_set_fs( thread_data->fs, teb ); thread_data->gs = get_gs(); + thread_data->syscall_table = KeServiceDescriptorTable; context.SegCs = get_cs(); context.SegDs = get_ds(); @@ -2458,7 +2459,6 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB frame->eip = (DWORD)pLdrInitializeThunk; frame->prev_frame = NULL; frame->syscall_flags = syscall_flags; - frame->syscall_table = KeServiceDescriptorTable; frame->restore_flags |= LOWORD(CONTEXT_INTEGER); pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); @@ -2569,7 +2569,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movl %eax,%ebx\n\t" "shrl $8,%ebx\n\t" "andl $0x30,%ebx\n\t" /* syscall table number */ - "addl 0x38(%ecx),%ebx\n\t" /* frame->syscall_table */ + "addl %fs:0x1fc,%ebx\n\t" /* x86_thread_data()->syscall_table */ "testl $3,(%ecx)\n\t" /* frame->syscall_flags & (SYSCALL_HAVE_XSAVE | SYSCALL_HAVE_XSAVEC) */ "jz 2f\n\t" "movl $7,%eax\n\t"

1 0

Rémi Bernon : ntdll: Remove unnecessary stack pointer CFI rules.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: e1f54247374a939c8276e85e113cc92c0d8f9467 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1f54247374a939c8276e85e113cc9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 22 00:06:33 2023 +0100 ntdll: Remove unnecessary stack pointer CFI rules. --- dlls/ntdll/unix/signal_i386.c | 8 -------- dlls/ntdll/unix/signal_x86_64.c | 7 ------- 2 files changed, 15 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 379e8a50022..9325a0a9ae8 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -2543,7 +2543,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_NAME("__wine_syscall_dispatcher_prolog_end") ":\n\t" "movl %esp,0x0c(%ecx)\n\t" /* frame->esp */ __ASM_CFI_CFA_IS_AT1(ecx, 0x0c) - __ASM_CFI_REG_IS_AT1(esp, ecx, 0x0c) "movw %cs,0x10(%ecx)\n\t" "movw %ss,0x12(%ecx)\n\t" "movw %ds,0x14(%ecx)\n\t" @@ -2561,7 +2560,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI_REG_IS_AT1(ebp, ecx, 0x34) "leal 0x34(%ecx),%ebp\n\t" __ASM_CFI_CFA_IS_AT1(ebp, 0x58) - __ASM_CFI_REG_IS_AT1(esp, ebp, 0x58) __ASM_CFI_REG_IS_AT1(eip, ebp, 0x54) __ASM_CFI_REG_IS_AT1(ebx, ebp, 0x6c) __ASM_CFI_REG_IS_AT1(edi, ebp, 0x78) @@ -2626,7 +2624,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ":\t" __ASM_CFI_CFA_IS_AT1(esp, 0x0c) - __ASM_CFI_REG_IS_AT1(esp, esp, 0x0c) __ASM_CFI_REG_IS_AT1(eip, esp, 0x08) __ASM_CFI_REG_IS_AT1(ebx, esp, 0x20) __ASM_CFI_REG_IS_AT1(edi, esp, 0x2c) @@ -2665,7 +2662,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI(".cfi_register %eip, %ecx\n\t") /* switch to user stack */ "movl 0x0c(%esp),%esp\n\t" /* frame->esp */ - __ASM_CFI(".cfi_same_value %esp\n\t") "pushl %ecx\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "ret\n" @@ -2681,7 +2677,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, /* switch to user stack */ "xchgl %ebx,%esp\n\t" __ASM_CFI(".cfi_def_cfa %esp, 0\n\t") - __ASM_CFI(".cfi_same_value %esp\n\t") __ASM_CFI_REG_IS_AT1(eip, ebx, 0x08) __ASM_CFI_REG_IS_AT1(ebx, ebx, 0x20) "pushl 0x04(%ebx)\n\t" /* frame->eflags */ @@ -2735,7 +2730,6 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, "leal 0x10(%esp),%edx\n\t" "movl %edx,0x0c(%ecx)\n\t" /* frame->esp */ __ASM_CFI_CFA_IS_AT1(ecx, 0x0c) - __ASM_CFI_REG_IS_AT1(esp, ecx, 0x0c) "movw %cs,0x10(%ecx)\n\t" "movw %ss,0x12(%ecx)\n\t" "movw %ds,0x14(%ecx)\n\t" @@ -2759,7 +2753,6 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, "call *(%eax,%edx,4)\n\t" "leal 16(%esp),%esp\n\t" __ASM_CFI_CFA_IS_AT1(esp, 0x0c) - __ASM_CFI_REG_IS_AT1(esp, esp, 0x0c) __ASM_CFI_REG_IS_AT1(eip, esp, 0x08) __ASM_CFI_REG_IS_AT1(ebx, esp, 0x20) __ASM_CFI_REG_IS_AT1(edi, esp, 0x2c) @@ -2771,7 +2764,6 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, __ASM_CFI(".cfi_register %eip, %ecx\n\t") /* switch to user stack */ "movl 0x0c(%esp),%esp\n\t" /* frame->esp */ - __ASM_CFI(".cfi_same_value %esp\n\t") "pushl %ecx\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "ret" ) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index de2993faa5b..54125501ffb 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2607,7 +2607,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movw %cs,0x78(%rcx)\n\t" "movq %rsp,0x88(%rcx)\n\t" __ASM_CFI_CFA_IS_AT2(rcx, 0x88, 0x01) - __ASM_CFI_REG_IS_AT2(rsp, rcx, 0x88, 0x01) "movw %ss,0x90(%rcx)\n\t" "movq %rbp,0x98(%rcx)\n\t" __ASM_CFI_REG_IS_AT2(rbp, rcx, 0x98, 0x01) @@ -2640,7 +2639,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI(".cfi_remember_state\n\t") "3:\tleaq 0x98(%rcx),%rbp\n\t" __ASM_CFI_CFA_IS_AT1(rbp, 0x70) - __ASM_CFI_REG_IS_AT1(rsp, rbp, 0x70) __ASM_CFI_REG_IS_AT1(rip, rbp, 0x58) __ASM_CFI_REG_IS_AT2(rbx, rbp, 0xf0, 0x7e) __ASM_CFI_REG_IS_AT2(rsi, rbp, 0x88, 0x7f) @@ -2756,7 +2754,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, /* switch to user stack */ "movq 0x88(%rcx),%rsp\n\t" __ASM_CFI(".cfi_def_cfa rsp, 0\n\t") - __ASM_CFI(".cfi_same_value rsp\n\t") "movq 0x70(%rcx),%rcx\n\t" /* frame->rip */ __ASM_CFI(".cfi_register rip, rcx\n\t") "pushq %rcx\n\t" @@ -2768,7 +2765,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI(".cfi_remember_state\n\t") "1:\tleaq 0x70(%rcx),%rsp\n\t" __ASM_CFI_CFA_IS_AT1(rsp, 0x18) - __ASM_CFI_REG_IS_AT1(rsp, rsp, 0x18) __ASM_CFI_REG_IS_AT1(rip, rsp, 0x00) "testl $0x2,%edx\n\t" /* CONTEXT_INTEGER */ "jnz 1f\n\t" @@ -2786,7 +2782,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movq 0x10(%rcx),%rcx\n" "iretq\n" __ASM_CFI_CFA_IS_AT1(rbp, 0x70) - __ASM_CFI_REG_IS_AT1(rsp, rbp, 0x70) __ASM_CFI_REG_IS_AT1(rip, rbp, 0x58) __ASM_CFI_REG_IS_AT2(rbx, rbp, 0xf0, 0x7e) __ASM_CFI_REG_IS_AT2(rsi, rbp, 0x88, 0x7f) @@ -2842,7 +2837,6 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, __ASM_CFI_REG_IS_AT2(r15, rcx, 0xe8, 0x00) "movq %rsp,0x88(%rcx)\n\t" __ASM_CFI_CFA_IS_AT2(rcx, 0x88, 0x01) - __ASM_CFI_REG_IS_AT2(rsp, rcx, 0x88, 0x01) "movq %rbp,0x98(%rcx)\n\t" __ASM_CFI_REG_IS_AT2(rbp, rcx, 0x98, 0x01) "movdqa %xmm6,0x1c0(%rcx)\n\t" @@ -2903,7 +2897,6 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, __ASM_CFI(".cfi_same_value rsi\n\t") "movq 0x88(%rcx),%rsp\n\t" __ASM_CFI(".cfi_def_cfa rsp, 0\n\t") - __ASM_CFI(".cfi_same_value rsp\n\t") "pushq 0x70(%rcx)\n\t" /* frame->rip */ __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") "ret" )

1 0

Francisco Casas : tests: Test integers with the 'u' postfix.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: vkd3d Branch: master Commit: 3f09cdcaa1c7b6714213fc8a56640d8bf11d47fd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3f09cdcaa1c7b6714213fc8a56640… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Nov 16 12:30:52 2023 -0300 tests: Test integers with the 'u' postfix. --- tests/hlsl/initializer-numeric.shader_test | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tests/hlsl/initializer-numeric.shader_test b/tests/hlsl/initializer-numeric.shader_test index 40576887..d480b9d1 100644 --- a/tests/hlsl/initializer-numeric.shader_test +++ b/tests/hlsl/initializer-numeric.shader_test @@ -46,3 +46,31 @@ float4 main() : sv_target [test] draw quad probe all rgba (10.1, 1.1, 1.2, 2.1) 4 + + +[pixel shader todo] +float4 main() : sv_target +{ + float4 aa = { 3U, 0xfau, 020u, -1u}; + return aa; +} + +[test] +todo(sm<6) draw quad +todo(sm<6) probe all rgba (3.0, 250.0, 16.0, 4.2949673e+009) 4 + + +[require] +shader model < 6.0 + +[pixel shader todo] +float4 main() : sv_target +{ + // 3000000000 is -1294967296 when it doesn't have the 'u' suffix, except in SM6. + float2 aa = {3000000000, 3000000000U}; + return float4(aa, 0.0, 0.0); +} + +[test] +todo draw quad +todo probe all rgba (-1294967296.0, 3000000000.0, 0.0, 0.0) 4

1 0

Francisco Casas : vkd3d-shader/hlsl: Parse integers with the 'u' postfix.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: vkd3d Branch: master Commit: 9a8f6e0edb6df225c58520eca981fc0ef2e1d0a4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9a8f6e0edb6df225c58520eca981f… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Nov 16 12:06:40 2023 -0300 vkd3d-shader/hlsl: Parse integers with the 'u' postfix. --- libs/vkd3d-shader/hlsl.l | 6 +++--- tests/hlsl/initializer-numeric.shader_test | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 0e5f2bb6..c3570990 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -203,15 +203,15 @@ while {return KW_WHILE; } yylval->floatval = atof(yytext); return C_FLOAT; } -0x[0-9a-fA-F]+ { +0x[0-9a-fA-F]+[uU]? { yylval->intval = vkd3d_parse_integer(yytext); return C_INTEGER; } -0[0-7]+ { +0[0-7]+[uU]? { yylval->intval = vkd3d_parse_integer(yytext); return C_INTEGER; } -[0-9]+ { +[0-9]+[uU]? { yylval->intval = vkd3d_parse_integer(yytext); return C_INTEGER; } diff --git a/tests/hlsl/initializer-numeric.shader_test b/tests/hlsl/initializer-numeric.shader_test index d480b9d1..81d19d06 100644 --- a/tests/hlsl/initializer-numeric.shader_test +++ b/tests/hlsl/initializer-numeric.shader_test @@ -48,7 +48,7 @@ draw quad probe all rgba (10.1, 1.1, 1.2, 2.1) 4 -[pixel shader todo] +[pixel shader] float4 main() : sv_target { float4 aa = { 3U, 0xfau, 020u, -1u}; @@ -56,14 +56,14 @@ float4 main() : sv_target } [test] -todo(sm<6) draw quad +draw quad todo(sm<6) probe all rgba (3.0, 250.0, 16.0, 4.2949673e+009) 4 [require] shader model < 6.0 -[pixel shader todo] +[pixel shader] float4 main() : sv_target { // 3000000000 is -1294967296 when it doesn't have the 'u' suffix, except in SM6. @@ -72,5 +72,5 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad todo probe all rgba (-1294967296.0, 3000000000.0, 0.0, 0.0) 4

1 0

Henri Verbeet : tests: Introduce an OpenGL shader runner.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: vkd3d Branch: master Commit: beb3f6e0c27da93d6848c222a7b054a90b3c9adb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/beb3f6e0c27da93d6848c222a7b05… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 22 07:31:31 2023 +0200 tests: Introduce an OpenGL shader runner. --- Makefile.am | 5 +- configure.ac | 6 + gitlab/image.docker | 2 + tests/shader_runner.c | 23 +- tests/shader_runner.h | 3 + tests/shader_runner_gl.c | 1005 ++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 1033 insertions(+), 11 deletions(-)

1 0

Francisco Casas : vkd3d-shader/hlsl: Discern between signed and unsigned ints when parsing.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: vkd3d Branch: master Commit: 4e1bf5e163215c17564775b75b9ad7a2328b8917 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4e1bf5e163215c17564775b75b9ad… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Nov 16 15:32:16 2023 -0300 vkd3d-shader/hlsl: Discern between signed and unsigned ints when parsing. --- libs/vkd3d-shader/hlsl.l | 18 +++++++++++++++--- libs/vkd3d-shader/hlsl.y | 10 ++++++++++ tests/hlsl/initializer-numeric.shader_test | 4 ++-- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index c3570990..401fba60 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -203,18 +203,30 @@ while {return KW_WHILE; } yylval->floatval = atof(yytext); return C_FLOAT; } -0x[0-9a-fA-F]+[uU]? { +0x[0-9a-fA-F]+[lL]? { yylval->intval = vkd3d_parse_integer(yytext); return C_INTEGER; } -0[0-7]+[uU]? { +0[0-7]+[lL]? { yylval->intval = vkd3d_parse_integer(yytext); return C_INTEGER; } -[0-9]+[uU]? { +[0-9]+[lL]? { yylval->intval = vkd3d_parse_integer(yytext); return C_INTEGER; } +0x[0-9a-fA-F]+([uU]|[uU][lL]|[lL][uU]) { + yylval->intval = vkd3d_parse_integer(yytext); + return C_UNSIGNED; + } +0[0-7]+([uU]|[uU][lL]|[lL][uU]) { + yylval->intval = vkd3d_parse_integer(yytext); + return C_UNSIGNED; + } +[0-9]+([uU]|[uU][lL]|[lL][uU]) { + yylval->intval = vkd3d_parse_integer(yytext); + return C_UNSIGNED; + } {WS}+ {} {NEWLINE} { diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c25b101a..67b01293 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4975,6 +4975,7 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls %token <floatval> C_FLOAT %token <intval> C_INTEGER +%token <intval> C_UNSIGNED %token <intval> PRE_LINE %type <list> type_specs @@ -6709,6 +6710,15 @@ primary_expr: if (!($$ = make_block(ctx, c))) YYABORT; } + | C_UNSIGNED + { + struct hlsl_ir_node *c; + + if (!(c = hlsl_new_uint_constant(ctx, $1, &@1))) + YYABORT; + if (!($$ = make_block(ctx, c))) + YYABORT; + } | boolean { struct hlsl_ir_node *c; diff --git a/tests/hlsl/initializer-numeric.shader_test b/tests/hlsl/initializer-numeric.shader_test index 81d19d06..617b6740 100644 --- a/tests/hlsl/initializer-numeric.shader_test +++ b/tests/hlsl/initializer-numeric.shader_test @@ -57,7 +57,7 @@ float4 main() : sv_target [test] draw quad -todo(sm<6) probe all rgba (3.0, 250.0, 16.0, 4.2949673e+009) 4 +probe all rgba (3.0, 250.0, 16.0, 4.2949673e+009) 4 [require] @@ -73,4 +73,4 @@ float4 main() : sv_target [test] draw quad -todo probe all rgba (-1294967296.0, 3000000000.0, 0.0, 0.0) 4 +probe all rgba (-1294967296.0, 3000000000.0, 0.0, 0.0) 4

1 0

Francisco Casas : tests: Test overloads with signed and unsigned numeric values.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: vkd3d Branch: master Commit: 1ee9e23e00c4c319d68447407668d54c18e8afbd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1ee9e23e00c4c319d68447407668d… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Nov 16 15:39:22 2023 -0300 tests: Test overloads with signed and unsigned numeric values. --- tests/hlsl/function-overload.shader_test | 41 ++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/tests/hlsl/function-overload.shader_test b/tests/hlsl/function-overload.shader_test index ae35c483..6383c434 100644 --- a/tests/hlsl/function-overload.shader_test +++ b/tests/hlsl/function-overload.shader_test @@ -41,6 +41,47 @@ todo(sm<6) draw quad probe all rgba (0.1, 0.2, 0.1, 0.2) +[pixel shader fail todo] +float func(int arg) +{ + return 1.0; +} + +float func(uint arg) +{ + return 2.0; +} + +float4 main() : sv_target +{ + return func(3); // whether 3 is signed or unsigned is unspecified. +} + + +[pixel shader todo] +float func(int arg) +{ + return 1.0; +} + +float func(uint arg) +{ + return 2.0; +} + +float4 main() : sv_target +{ + int a = 3; + uint b = 3l; + + return float4(func(a), func(b), func(3u), func(3lu)); +} + +[test] +todo(sm<6) draw quad +todo(sm<6) probe all rgba (1.0, 2.0, 2.0, 2.0) + + % float and float1 can be defined separately... [pixel shader]

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement the DXIL LOAD instruction.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: vkd3d Branch: master Commit: eb05e434ffcbc28e30518105d73f7c33bc4dfe3b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/eb05e434ffcbc28e30518105d73f7… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Nov 22 12:42:23 2023 +1000 vkd3d-shader/dxil: Implement the DXIL LOAD instruction. --- libs/vkd3d-shader/dxil.c | 66 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/ir.c | 1 + libs/vkd3d-shader/spirv.c | 3 ++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 + tests/hlsl/matrix-indexing.shader_test | 2 +- 5 files changed, 73 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 4249e7f5..1709212f 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2207,6 +2207,18 @@ static bool sm6_value_validate_is_pointer(const struct sm6_value *value, struct return true; } +static bool sm6_value_validate_is_numeric(const struct sm6_value *value, struct sm6_parser *sm6) +{ + if (!sm6_type_is_numeric(value->type)) + { + WARN("Operand result type class %u is not numeric.\n", value->type->class); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "A numeric operand passed to a DXIL instruction is not numeric."); + return false; + } + return true; +} + static bool sm6_value_validate_is_bool(const struct sm6_value *value, struct sm6_parser *sm6) { const struct sm6_type *type = value->type; @@ -3989,6 +4001,57 @@ static void sm6_parser_emit_gep(struct sm6_parser *sm6, const struct dxil_record ins->handler_idx = VKD3DSIH_NOP; } +static void sm6_parser_emit_load(struct sm6_parser *sm6, const struct dxil_record *record, + struct vkd3d_shader_instruction *ins, struct sm6_value *dst) +{ + const struct sm6_type *elem_type = NULL, *pointee_type; + struct vkd3d_shader_src_param *src_param; + unsigned int alignment, i = 0; + const struct sm6_value *ptr; + uint64_t alignment_code; + + if (!(ptr = sm6_parser_get_value_by_ref(sm6, record, NULL, &i))) + return; + if (!sm6_value_validate_is_register(ptr, sm6) + || !sm6_value_validate_is_pointer(ptr, sm6) + || !dxil_record_validate_operand_count(record, i + 2, i + 3, sm6)) + return; + + if (record->operand_count > i + 2 && !(elem_type = sm6_parser_get_type(sm6, record->operands[i++]))) + return; + + if (!elem_type) + { + elem_type = ptr->type->u.pointer.type; + } + else if (elem_type != (pointee_type = ptr->type->u.pointer.type)) + { + WARN("Type mismatch.\n"); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_TYPE_MISMATCH, + "Type mismatch in pointer load arguments."); + } + + dst->type = elem_type; + + if (!sm6_value_validate_is_numeric(dst, sm6)) + return; + + alignment_code = record->operands[i++]; + if (!bitcode_parse_alignment(alignment_code, &alignment)) + WARN("Invalid alignment %"PRIu64".\n", alignment_code); + + if (record->operands[i]) + WARN("Ignoring volatile modifier.\n"); + + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV); + + src_param = instruction_src_params_alloc(ins, 1, sm6); + src_param_init_from_value(&src_param[0], ptr); + src_param->reg.alignment = alignment; + + instruction_dst_param_init_ssa_scalar(ins, sm6); +} + static void sm6_parser_emit_ret(struct sm6_parser *sm6, const struct dxil_record *record, struct sm6_block *code_block, struct vkd3d_shader_instruction *ins) { @@ -4194,6 +4257,9 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const case FUNC_CODE_INST_GEP: sm6_parser_emit_gep(sm6, record, ins, dst); break; + case FUNC_CODE_INST_LOAD: + sm6_parser_emit_load(sm6, record, ins, dst); + break; case FUNC_CODE_INST_RET: sm6_parser_emit_ret(sm6, record, code_block, ins); is_terminator = true; diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 8ddfc115..acdb660e 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -309,6 +309,7 @@ void vsir_register_init(struct vkd3d_shader_register *reg, enum vkd3d_shader_reg reg->idx[2].is_in_bounds = false; reg->idx_count = idx_count; reg->dimension = VSIR_DIMENSION_SCALAR; + reg->alignment = 0; } void vsir_instruction_init(struct vkd3d_shader_instruction *ins, const struct vkd3d_shader_location *location, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 67c5e383..be149a0c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3525,6 +3525,9 @@ static void spirv_compiler_emit_dereference_register(struct spirv_compiler *comp indexes[index_count++] = spirv_compiler_emit_register_addressing(compiler, &reg->idx[0]); } + if (reg->alignment) + WARN("Ignoring alignment %u.\n", reg->alignment); + if (index_count) { component_count = vkd3d_write_mask_component_count(register_info->write_mask); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index cdf636f8..d3989672 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -827,6 +827,8 @@ struct vkd3d_shader_register struct vkd3d_shader_register_index idx[3]; unsigned int idx_count; enum vsir_dimension dimension; + /* known address alignment for optimisation, or zero */ + unsigned int alignment; union { DWORD immconst_uint[VKD3D_VEC4_SIZE]; diff --git a/tests/hlsl/matrix-indexing.shader_test b/tests/hlsl/matrix-indexing.shader_test index b8e6dec6..5024c8ed 100644 --- a/tests/hlsl/matrix-indexing.shader_test +++ b/tests/hlsl/matrix-indexing.shader_test @@ -137,4 +137,4 @@ float4 main() : sv_target [test] uniform 0 float 3 todo(sm>=6) draw quad -todo(sm>=6) probe all rgba (12, 13, 14, 15) +probe all rgba (12, 13, 14, 15)

1 0

Conor McCarthy : vkd3d-shader/dxil: Support global variable initialisers.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: vkd3d Branch: master Commit: a0f5d70792d203e1a9a9e9e64aa5afdda9b553c1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a0f5d70792d203e1a9a9e9e64aa5a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Nov 14 00:50:30 2023 +1000 vkd3d-shader/dxil: Support global variable initialisers. --- libs/vkd3d-shader/d3d_asm.c | 43 ++++++++++++++++++++++------- libs/vkd3d-shader/dxil.c | 47 +++++++++++++++++++++++++------- libs/vkd3d-shader/spirv.c | 6 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 4 files changed, 78 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index f6d511e7..82d1d71d 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -1595,6 +1595,36 @@ static void shader_print_opcode(struct vkd3d_d3d_asm_compiler *compiler, enum vk shader_opcode_names[opcode], compiler->colours.reset); } +static void shader_dump_icb(struct vkd3d_d3d_asm_compiler *compiler, + const struct vkd3d_shader_immediate_constant_buffer *icb) +{ + struct vkd3d_string_buffer *buffer = &compiler->buffer; + unsigned int i, j; + + vkd3d_string_buffer_printf(buffer, " {\n"); + if (icb->component_count == 1) + { + for (i = 0; i < icb->element_count; ) + { + for (j = 0; i < icb->element_count && j < 4; ++i, ++j) + shader_print_hex_literal(compiler, !j ? " " : ", ", icb->data[i], ""); + vkd3d_string_buffer_printf(buffer, "\n"); + } + } + else + { + assert(icb->component_count == VKD3D_VEC4_SIZE); + for (i = 0; i < icb->element_count; ++i) + { + shader_print_hex_literal(compiler, " {", icb->data[4 * i + 0], ""); + shader_print_hex_literal(compiler, ", ", icb->data[4 * i + 1], ""); + shader_print_hex_literal(compiler, ", ", icb->data[4 * i + 2], ""); + shader_print_hex_literal(compiler, ", ", icb->data[4 * i + 3], "},\n"); + } + } + shader_addline(buffer, "}"); +} + static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_instruction *ins) { @@ -1656,16 +1686,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER: - vkd3d_string_buffer_printf(buffer, " {\n"); - assert(ins->declaration.icb->component_count == VKD3D_VEC4_SIZE); - for (i = 0; i < ins->declaration.icb->element_count; ++i) - { - shader_print_hex_literal(compiler, " {", ins->declaration.icb->data[4 * i + 0], ""); - shader_print_hex_literal(compiler, ", ", ins->declaration.icb->data[4 * i + 1], ""); - shader_print_hex_literal(compiler, ", ", ins->declaration.icb->data[4 * i + 2], ""); - shader_print_hex_literal(compiler, ", ", ins->declaration.icb->data[4 * i + 3], "},\n"); - } - shader_addline(buffer, "}"); + shader_dump_icb(compiler, ins->declaration.icb); break; case VKD3DSIH_DCL_INDEX_RANGE: @@ -1681,6 +1702,8 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_print_uint_literal(compiler, ", ", ins->declaration.indexable_temp.component_count, ""); if (ins->declaration.indexable_temp.alignment) shader_print_uint_literal(compiler, ", align ", ins->declaration.indexable_temp.alignment, ""); + if (ins->declaration.indexable_temp.initialiser) + shader_dump_icb(compiler, ins->declaration.indexable_temp.initialiser); break; case VKD3DSIH_DCL_INPUT_PS: diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 1929fcb4..5990b6df 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2603,7 +2603,7 @@ static struct vkd3d_shader_instruction *sm6_parser_add_instruction(struct sm6_pa } static void sm6_parser_declare_indexable_temp(struct sm6_parser *sm6, const struct sm6_type *elem_type, - unsigned int count, unsigned int alignment, struct sm6_value *dst) + unsigned int count, unsigned int alignment, unsigned int init, struct sm6_value *dst) { enum vkd3d_data_type data_type = vkd3d_data_type_from_sm6_type(elem_type); struct vkd3d_shader_instruction *ins; @@ -2614,6 +2614,8 @@ static void sm6_parser_declare_indexable_temp(struct sm6_parser *sm6, const stru ins->declaration.indexable_temp.alignment = alignment; ins->declaration.indexable_temp.data_type = data_type; ins->declaration.indexable_temp.component_count = 1; + /* The initialiser value index will be resolved later so forward references can be handled. */ + ins->declaration.indexable_temp.initialiser = (void *)(uintptr_t)init; register_init_with_id(&dst->u.reg, VKD3DSPR_IDXTEMP, data_type, ins->declaration.indexable_temp.register_idx); } @@ -2726,14 +2728,7 @@ static bool sm6_parser_declare_global(struct sm6_parser *sm6, const struct dxil_ dst->type = type; dst->value_type = VALUE_TYPE_REG; - if (init) - { - FIXME("Unsupported initialiser.\n"); - vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, - "Global variable initialisers are not supported."); - return false; - } - else if (is_constant) + if (is_constant && !init) { WARN("Constant array has no initialiser.\n"); vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, @@ -2743,7 +2738,7 @@ static bool sm6_parser_declare_global(struct sm6_parser *sm6, const struct dxil_ if (address_space == ADDRESS_SPACE_DEFAULT) { - sm6_parser_declare_indexable_temp(sm6, scalar_type, count, alignment, dst); + sm6_parser_declare_indexable_temp(sm6, scalar_type, count, alignment, init, dst); } else if (address_space == ADDRESS_SPACE_GROUPSHARED) { @@ -2764,9 +2759,30 @@ static bool sm6_parser_declare_global(struct sm6_parser *sm6, const struct dxil_ return true; } +static const struct vkd3d_shader_immediate_constant_buffer *resolve_forward_initialiser( + size_t index, struct sm6_parser *sm6) +{ + const struct sm6_value *value; + + assert(index); + --index; + if (!(value = sm6_parser_get_value_safe(sm6, index)) || !sm6_value_is_icb(value)) + { + WARN("Invalid initialiser index %zu.\n", index); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Global variable initialiser value index %zu is invalid.", index); + return NULL; + } + else + { + return value->u.icb; + } +} + static enum vkd3d_result sm6_parser_globals_init(struct sm6_parser *sm6) { const struct dxil_block *block = &sm6->root_block; + struct vkd3d_shader_instruction *ins; const struct dxil_record *record; enum vkd3d_result ret; uint64_t version; @@ -2819,6 +2835,17 @@ static enum vkd3d_result sm6_parser_globals_init(struct sm6_parser *sm6) return ret; } + /* Resolve initialiser forward references. */ + for (i = 0; i < sm6->p.instructions.count; ++i) + { + ins = &sm6->p.instructions.elements[i]; + if (ins->handler_idx == VKD3DSIH_DCL_INDEXABLE_TEMP && ins->declaration.indexable_temp.initialiser) + { + ins->declaration.indexable_temp.initialiser = resolve_forward_initialiser( + (uintptr_t)ins->declaration.indexable_temp.initialiser, sm6); + } + } + return VKD3D_OK; } diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e6fb0a12..67c5e383 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5497,6 +5497,12 @@ static void spirv_compiler_emit_dcl_indexable_temp(struct spirv_compiler *compil if (temp->alignment) WARN("Ignoring alignment %u.\n", temp->alignment); + if (temp->initialiser) + { + FIXME("Initialisers are not supported.\n"); + spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_NOT_IMPLEMENTED, + "Initialisers for indexable temps are not supported."); + } function_location = spirv_compiler_get_current_function_location(compiler); vkd3d_spirv_begin_function_stream_insertion(builder, function_location); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e4e0ca42..fc6c5fca 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -95,6 +95,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_SPV_OUT_OF_MEMORY = 2005, VKD3D_SHADER_ERROR_SPV_INVALID_TYPE = 2006, VKD3D_SHADER_ERROR_SPV_INVALID_HANDLER = 2007, + VKD3D_SHADER_ERROR_SPV_NOT_IMPLEMENTED = 2008, VKD3D_SHADER_WARNING_SPV_INVALID_SWIZZLE = 2300, @@ -806,6 +807,7 @@ struct vkd3d_shader_indexable_temp unsigned int alignment; enum vkd3d_data_type data_type; unsigned int component_count; + const struct vkd3d_shader_immediate_constant_buffer *initialiser; }; struct vkd3d_shader_register_index

1 0