February 2024 - Wine-commits

Jinoh Kang : include: Add definition for FILE_STAT_INFORMATION.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: 4f61a8a1ab0ff03250c613f33fc09d55656b701d URL: https://gitlab.winehq.org/wine/wine/-/commit/4f61a8a1ab0ff03250c613f33fc09d… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Feb 20 00:43:59 2024 +0900 include: Add definition for FILE_STAT_INFORMATION. --- include/winternl.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/winternl.h b/include/winternl.h index 52af87320a5..04778c5cd59 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1633,6 +1633,20 @@ typedef struct _FILE_ALL_INFORMATION { FILE_NAME_INFORMATION NameInformation; } FILE_ALL_INFORMATION, *PFILE_ALL_INFORMATION; +typedef struct _FILE_STAT_INFORMATION { + LARGE_INTEGER FileId; + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER AllocationSize; + LARGE_INTEGER EndOfFile; + ULONG FileAttributes; + ULONG ReparseTag; + ULONG NumberOfLinks; + ULONG EffectiveAccess; +} FILE_STAT_INFORMATION, *PFILE_STAT_INFORMATION; + typedef struct _FILE_IO_COMPLETION_NOTIFICATION_INFORMATION { ULONG Flags; } FILE_IO_COMPLETION_NOTIFICATION_INFORMATION, *PFILE_IO_COMPLETION_NOTIFICATION_INFORMATION;

1 0

Jinoh Kang : ntdll/tests: Add tests for NtQueryInformationFile FileStatInformation.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: f5e7abb428f2e2fb580c42e7bb3e179d70d89300 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5e7abb428f2e2fb580c42e7bb3e17… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Feb 20 00:44:34 2024 +0900 ntdll/tests: Add tests for NtQueryInformationFile FileStatInformation. --- dlls/ntdll/tests/file.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index da3611f74f2..3ea5eeea01f 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4357,6 +4357,57 @@ static void test_file_attribute_tag_information(void) CloseHandle( h ); } +static void test_file_stat_information(void) +{ + BY_HANDLE_FILE_INFORMATION info; + FILE_STAT_INFORMATION fsd; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE h; + BOOL ret; + + if (!(h = create_temp_file(0))) return; + + memset( &fsd, 0x11, sizeof(fsd) ); + status = pNtQueryInformationFile( h, &io, &fsd, sizeof(fsd), FileStatInformation ); + if (status == STATUS_NOT_IMPLEMENTED || status == STATUS_INVALID_INFO_CLASS) + { + skip( "FileStatInformation not supported\n" ); + CloseHandle( h ); + return; + } + ok( status == STATUS_SUCCESS, "query FileStatInformation returned %#lx\n", status ); + + memset( &info, 0x22, sizeof(info) ); + ret = GetFileInformationByHandle( h, &info ); + ok( ret, "GetFileInformationByHandle failed\n" ); + + ok( fsd.FileId.u.LowPart == info.nFileIndexLow, "expected %08lx, got %08lx\n", info.nFileIndexLow, fsd.FileId.u.LowPart ); + ok( fsd.FileId.u.HighPart == info.nFileIndexHigh, "expected %08lx, got %08lx\n", info.nFileIndexHigh, fsd.FileId.u.HighPart ); + ok( fsd.CreationTime.u.LowPart == info.ftCreationTime.dwLowDateTime, "expected %08lx, got %08lx\n", + info.ftCreationTime.dwLowDateTime, fsd.CreationTime.u.LowPart ); + ok( fsd.CreationTime.u.HighPart == info.ftCreationTime.dwHighDateTime, "expected %08lx, got %08lx\n", + info.ftCreationTime.dwHighDateTime, fsd.CreationTime.u.HighPart ); + ok( fsd.LastAccessTime.u.LowPart == info.ftLastAccessTime.dwLowDateTime, "expected %08lx, got %08lx\n", + info.ftLastAccessTime.dwLowDateTime, fsd.LastAccessTime.u.LowPart ); + ok( fsd.LastAccessTime.u.HighPart == info.ftLastAccessTime.dwHighDateTime, "expected %08lx, got %08lx\n", + info.ftLastAccessTime.dwHighDateTime, fsd.LastAccessTime.u.HighPart ); + ok( fsd.LastWriteTime.u.LowPart == info.ftLastWriteTime.dwLowDateTime, "expected %08lx, got %08lx\n", + info.ftLastWriteTime.dwLowDateTime, fsd.LastWriteTime.u.LowPart ); + ok( fsd.LastWriteTime.u.HighPart == info.ftLastWriteTime.dwHighDateTime, "expected %08lx, got %08lx\n", + info.ftLastWriteTime.dwHighDateTime, fsd.LastWriteTime.u.HighPart ); + /* TODO: ChangeTime */ + /* TODO: AllocationSize */ + ok( fsd.EndOfFile.u.LowPart == info.nFileSizeLow, "expected %08lx, got %08lx\n", info.nFileSizeLow, fsd.EndOfFile.u.LowPart ); + ok( fsd.EndOfFile.u.HighPart == info.nFileSizeHigh, "expected %08lx, got %08lx\n", info.nFileSizeHigh, fsd.EndOfFile.u.HighPart ); + ok( fsd.FileAttributes == info.dwFileAttributes, "expected %08lx, got %08lx\n", info.dwFileAttributes, fsd.FileAttributes ); + ok( !fsd.ReparseTag, "got reparse tag %#lx\n", fsd.ReparseTag ); + ok( fsd.NumberOfLinks == info.nNumberOfLinks, "expected %08lx, got %08lx\n", info.nNumberOfLinks, fsd.NumberOfLinks ); + ok( fsd.EffectiveAccess == FILE_ALL_ACCESS, "got %08lx\n", fsd.EffectiveAccess ); + + CloseHandle( h ); +} + static void rename_file( HANDLE h, const WCHAR *filename ) { FILE_RENAME_INFORMATION *fri; @@ -5900,6 +5951,7 @@ START_TEST(file) test_file_id_information(); test_file_access_information(); test_file_attribute_tag_information(); + test_file_stat_information(); test_dotfile_file_attributes(); test_file_mode(); test_file_readonly_access();

1 0

Jinoh Kang : ntdll: Implement NtQueryInformationFile FileStatInformation.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: 152580cefeb4ec63a2560fe76aad98dc674dcced URL: https://gitlab.winehq.org/wine/wine/-/commit/152580cefeb4ec63a2560fe76aad98… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Feb 20 00:45:16 2024 +0900 ntdll: Implement NtQueryInformationFile FileStatInformation. --- dlls/ntdll/tests/file.c | 2 +- dlls/ntdll/unix/file.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 3ea5eeea01f..9dd49c925b7 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4372,7 +4372,7 @@ static void test_file_stat_information(void) status = pNtQueryInformationFile( h, &io, &fsd, sizeof(fsd), FileStatInformation ); if (status == STATUS_NOT_IMPLEMENTED || status == STATUS_INVALID_INFO_CLASS) { - skip( "FileStatInformation not supported\n" ); + win_skip( "FileStatInformation not supported\n" ); CloseHandle( h ); return; } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index ee68e4dee9b..d292d934efa 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4334,7 +4334,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, 0, /* FileRenameInformationEx */ 0, /* FileRenameInformationExBypassAccessCheck */ 0, /* FileDesiredStorageClassInformation */ - 0, /* FileStatInformation */ + sizeof(FILE_STAT_INFORMATION), /* FileStatInformation */ 0, /* FileMemoryPartitionInformation */ 0, /* FileStatLxInformation */ 0, /* FileCaseSensitiveInformation */ @@ -4549,6 +4549,34 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, info->ReparseTag = IO_REPARSE_TAG_MOUNT_POINT; } break; + case FileStatInformation: + if (fd_get_file_info( fd, options, &st, &attr ) == -1) status = errno_to_status( errno ); + else if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode)) + status = STATUS_INVALID_INFO_CLASS; + else + { + FILE_STAT_INFORMATION *info = ptr; + FILE_BASIC_INFORMATION basic; + FILE_STANDARD_INFORMATION std; + + fill_file_info( &st, attr, &basic, FileBasicInformation ); + fill_file_info( &st, attr, &std, FileStandardInformation ); + + info->FileId.QuadPart = st.st_ino; + info->CreationTime = basic.CreationTime; + info->LastAccessTime = basic.LastAccessTime; + info->LastWriteTime = basic.LastWriteTime; + info->ChangeTime = basic.ChangeTime; + info->AllocationSize = std.AllocationSize; + info->EndOfFile = std.EndOfFile; + info->FileAttributes = attr; + info->ReparseTag = 0; /* FIXME */ + if ((options & FILE_OPEN_REPARSE_POINT) && fd_is_mount_point( fd, &st )) + info->ReparseTag = IO_REPARSE_TAG_MOUNT_POINT; + info->NumberOfLinks = std.NumberOfLinks; + info->EffectiveAccess = FILE_ALL_ACCESS; /* FIXME */ + } + break; default: FIXME("Unsupported class (%d)\n", class); status = STATUS_NOT_IMPLEMENTED;

1 0

Jinoh Kang : kernelbase: Replace FileAllInformation with FileStatInformation in GetFileInformationByHandle().
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: 1b0d8428dfc13b0fa5ea7d576dfef7aaf8a8c927 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b0d8428dfc13b0fa5ea7d576dfef7… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Feb 20 00:47:19 2024 +0900 kernelbase: Replace FileAllInformation with FileStatInformation in GetFileInformationByHandle(). It also fixes the game Unity of Command II (same bug). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46070 --- dlls/kernelbase/file.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 67a7a34249a..2b59db43041 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -3043,27 +3043,26 @@ BOOL WINAPI DECLSPEC_HOTPATCH FlushFileBuffers( HANDLE file ) BOOL WINAPI DECLSPEC_HOTPATCH GetFileInformationByHandle( HANDLE file, BY_HANDLE_FILE_INFORMATION *info ) { FILE_FS_VOLUME_INFORMATION volume_info; - FILE_ALL_INFORMATION all_info; + FILE_STAT_INFORMATION stat_info; IO_STATUS_BLOCK io; NTSTATUS status; - status = NtQueryInformationFile( file, &io, &all_info, sizeof(all_info), FileAllInformation ); - if (status == STATUS_BUFFER_OVERFLOW) status = STATUS_SUCCESS; + status = NtQueryInformationFile( file, &io, &stat_info, sizeof(stat_info), FileStatInformation ); if (!set_ntstatus( status )) return FALSE; - info->dwFileAttributes = all_info.BasicInformation.FileAttributes; - info->ftCreationTime.dwHighDateTime = all_info.BasicInformation.CreationTime.u.HighPart; - info->ftCreationTime.dwLowDateTime = all_info.BasicInformation.CreationTime.u.LowPart; - info->ftLastAccessTime.dwHighDateTime = all_info.BasicInformation.LastAccessTime.u.HighPart; - info->ftLastAccessTime.dwLowDateTime = all_info.BasicInformation.LastAccessTime.u.LowPart; - info->ftLastWriteTime.dwHighDateTime = all_info.BasicInformation.LastWriteTime.u.HighPart; - info->ftLastWriteTime.dwLowDateTime = all_info.BasicInformation.LastWriteTime.u.LowPart; + info->dwFileAttributes = stat_info.FileAttributes; + info->ftCreationTime.dwHighDateTime = stat_info.CreationTime.u.HighPart; + info->ftCreationTime.dwLowDateTime = stat_info.CreationTime.u.LowPart; + info->ftLastAccessTime.dwHighDateTime = stat_info.LastAccessTime.u.HighPart; + info->ftLastAccessTime.dwLowDateTime = stat_info.LastAccessTime.u.LowPart; + info->ftLastWriteTime.dwHighDateTime = stat_info.LastWriteTime.u.HighPart; + info->ftLastWriteTime.dwLowDateTime = stat_info.LastWriteTime.u.LowPart; info->dwVolumeSerialNumber = 0; - info->nFileSizeHigh = all_info.StandardInformation.EndOfFile.u.HighPart; - info->nFileSizeLow = all_info.StandardInformation.EndOfFile.u.LowPart; - info->nNumberOfLinks = all_info.StandardInformation.NumberOfLinks; - info->nFileIndexHigh = all_info.InternalInformation.IndexNumber.u.HighPart; - info->nFileIndexLow = all_info.InternalInformation.IndexNumber.u.LowPart; + info->nFileSizeHigh = stat_info.EndOfFile.u.HighPart; + info->nFileSizeLow = stat_info.EndOfFile.u.LowPart; + info->nNumberOfLinks = stat_info.NumberOfLinks; + info->nFileIndexHigh = stat_info.FileId.u.HighPart; + info->nFileIndexLow = stat_info.FileId.u.LowPart; status = NtQueryVolumeInformationFile( file, &io, &volume_info, sizeof(volume_info), FileFsVolumeInformation ); if (status == STATUS_SUCCESS || status == STATUS_BUFFER_OVERFLOW)

1 0

Francisco Casas : vkd3d-shader/hlsl: Record valid methods in object_methods[].
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: vkd3d Branch: master Commit: e1c759e1c9d7c275677fe7155fd548410b85ac9d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e1c759e1c9d7c275677fe7155fd54… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jan 31 20:08:00 2024 -0300 vkd3d-shader/hlsl: Record valid methods in object_methods[]. Also, call hlsl_sampler_dim_count() and hlsl_offset_dim_count() after type checking, to avoid reaching unreacheable cases. --- libs/vkd3d-shader/hlsl.h | 7 ++-- libs/vkd3d-shader/hlsl.y | 105 +++++++++++++++++++++-------------------------- 2 files changed, 50 insertions(+), 62 deletions(-)

1 0

Francisco Casas : tests/shader-runner: Separate resource_type into type and dimension.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: vkd3d Branch: master Commit: 22a0f14a2f4f89797e9cf25e018f2bd51eff7fcb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/22a0f14a2f4f89797e9cf25e018f2… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Jan 22 20:20:18 2024 -0300 tests/shader-runner: Separate resource_type into type and dimension. If in the same shader_test file we have both a [buffer uav n] and a [uav n] with the same slot "n", we want the last one to override the first one instead of passing both resources to the backends. Same for [buffer srv n] and [texture n] after we introduce SRV buffers. --- tests/shader_runner.c | 13 ++- tests/shader_runner.h | 9 +- tests/shader_runner_d3d11.c | 190 ++++++++++++++++++---------------- tests/shader_runner_d3d12.c | 65 ++++++------ tests/shader_runner_d3d9.c | 2 - tests/shader_runner_gl.c | 123 ++++++++++++---------- tests/shader_runner_vulkan.c | 238 +++++++++++++++++++++++-------------------- 7 files changed, 351 insertions(+), 289 deletions(-)

1 0

Francisco Casas : tests/shader-runner: Support SRV buffers.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: vkd3d Branch: master Commit: 4d855611b758294f9a6745cc7a907982808f013f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4d855611b758294f9a6745cc7a907… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Jan 23 20:26:11 2024 -0300 tests/shader-runner: Support SRV buffers. --- Makefile.am | 1 + tests/hlsl/srv-buffers.shader_test | 189 +++++++++++++++++++++++++++++++++++++ tests/shader_runner.c | 14 +++ tests/shader_runner_d3d11.c | 23 ++++- tests/shader_runner_d3d12.c | 43 +++++++-- tests/shader_runner_d3d9.c | 8 ++ tests/shader_runner_gl.c | 24 +++-- tests/shader_runner_vulkan.c | 26 +++-- 8 files changed, 300 insertions(+), 28 deletions(-)

1 0

Francisco Casas : tests/shader-runner: Change resource declaration syntax on shader_test files.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: vkd3d Branch: master Commit: b08be044658d8b3e569574f17d08f34c892a6bdf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b08be044658d8b3e569574f17d08f… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jan 24 16:11:17 2024 -0300 tests/shader-runner: Change resource declaration syntax on shader_test files. On shader_test files, now resources should be declared this way: [texture n] -> [srv n] [srv buffer n] -> [srv n] [uav n] -> [uav n] [uav buffer n] -> [uav n] [vertex buffer n] -> [vb n] [render target n] -> [rtv n] The dimension (buffer or 2D) is now specified as an additional parameter in the "size" directive: For 2D resources: size (n, m) -> size (2d, n, m) For buffers: size (n, 1) -> size (buffer, n) --- tests/hlsl/bool-semantics.shader_test | 2 +- tests/hlsl/cbuffer.shader_test | 16 +++---- tests/hlsl/combined-samplers.shader_test | 20 ++++---- tests/hlsl/compute.shader_test | 2 +- tests/hlsl/gather-offset.shader_test | 4 +- tests/hlsl/gather.shader_test | 4 +- tests/hlsl/getdimensions.shader_test | 8 ++-- tests/hlsl/initializer-objects.shader_test | 8 ++-- tests/hlsl/is-front-face.shader_test | 4 +- tests/hlsl/load-level.shader_test | 4 +- tests/hlsl/matrix-semantics.shader_test | 20 ++++---- tests/hlsl/multiple-rt.shader_test | 8 ++-- tests/hlsl/nointerpolation.shader_test | 2 +- tests/hlsl/numthreads.shader_test | 2 +- tests/hlsl/object-parameters.shader_test | 24 +++++----- tests/hlsl/object-references.shader_test | 28 +++++------ tests/hlsl/rasteriser-ordered-views.shader_test | 10 ++-- .../register-reservations-resources.shader_test | 28 +++++------ tests/hlsl/sample-bias.shader_test | 4 +- tests/hlsl/sample-grad.shader_test | 4 +- tests/hlsl/sample-level.shader_test | 4 +- tests/hlsl/sampler-offset.shader_test | 4 +- tests/hlsl/sampler.shader_test | 4 +- tests/hlsl/shader-interstage-interface.shader_test | 4 +- tests/hlsl/sm6-uav-rwtexture.shader_test | 15 ++---- tests/hlsl/srv-buffers.shader_test | 16 +++---- tests/hlsl/static-initializer.shader_test | 6 +-- tests/hlsl/struct-semantics.shader_test | 2 +- tests/hlsl/swizzle-constant-prop.shader_test | 4 +- tests/hlsl/texture-load-offset.shader_test | 4 +- tests/hlsl/texture-load-typed.shader_test | 12 ++--- tests/hlsl/texture-load.shader_test | 4 +- tests/hlsl/texture-ordering.shader_test | 40 ++++++++-------- tests/hlsl/uav-load.shader_test | 4 +- tests/hlsl/uav-out-param.shader_test | 4 +- tests/hlsl/uav-rwbuffer.shader_test | 9 ++-- tests/hlsl/uav-rwtexture.shader_test | 16 +++---- tests/shader_runner.c | 55 +++++++--------------- 38 files changed, 190 insertions(+), 219 deletions(-)

1 0

Francisco Casas : tests/shader-runner: Change probe directive syntax on shader_test files.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: vkd3d Branch: master Commit: 4fe9ab0a902d6c773148627c0defa4a476aca396 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4fe9ab0a902d6c773148627c0defa… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jan 24 16:35:39 2024 -0300 tests/shader-runner: Change probe directive syntax on shader_test files. For consistency with the previous commit. --- tests/hlsl/matrix-semantics.shader_test | 30 +++++++++++++++--------------- tests/hlsl/multiple-rt.shader_test | 4 ++-- tests/hlsl/uav-rwbuffer.shader_test | 2 +- tests/shader_runner.c | 17 ++++++----------- 4 files changed, 24 insertions(+), 29 deletions(-) diff --git a/tests/hlsl/matrix-semantics.shader_test b/tests/hlsl/matrix-semantics.shader_test index ec2d191b..476b56bf 100644 --- a/tests/hlsl/matrix-semantics.shader_test +++ b/tests/hlsl/matrix-semantics.shader_test @@ -45,10 +45,10 @@ row_major float4x1 main() : sv_target [test] todo(sm>=6) draw quad -probe render target 0 all r (1.0) -probe render target 1 all r (2.0) -probe render target 2 all r (3.0) -probe render target 3 all r (4.0) +probe rtv 0 all r (1.0) +probe rtv 1 all r (2.0) +probe rtv 2 all r (3.0) +probe rtv 3 all r (4.0) [pixel shader fail(sm>=6)] float1x4 main() : sv_target @@ -58,10 +58,10 @@ float1x4 main() : sv_target [test] todo(sm>=6) draw quad -probe render target 0 all r (1.0) -probe render target 1 all r (2.0) -probe render target 2 all r (3.0) -probe render target 3 all r (4.0) +probe rtv 0 all r (1.0) +probe rtv 1 all r (2.0) +probe rtv 2 all r (3.0) +probe rtv 3 all r (4.0) [pixel shader fail] void main(out float1x2 x : sv_target0, out float1x2 y : sv_target1) @@ -79,10 +79,10 @@ void main(out float1x2 x : sv_target0, out float1x2 y : sv_target2) [test] todo(sm>=6) draw quad -probe render target 0 all r (1.0) -probe render target 1 all r (2.0) -probe render target 2 all r (5.0) -probe render target 3 all r (6.0) +probe rtv 0 all r (1.0) +probe rtv 1 all r (2.0) +probe rtv 2 all r (5.0) +probe rtv 3 all r (6.0) [rtv 0] format r32g32b32a32 float @@ -97,6 +97,6 @@ void main(out row_major float1x4 x : sv_target0, out float1x2 y : sv_target1) [test] todo(sm>=6) draw quad -probe render target 0 all rgba (1.0, 2.0, 3.0, 4.0) -probe render target 1 all r (5.0) -probe render target 2 all r (6.0) +probe rtv 0 all rgba (1.0, 2.0, 3.0, 4.0) +probe rtv 1 all r (5.0) +probe rtv 2 all r (6.0) diff --git a/tests/hlsl/multiple-rt.shader_test b/tests/hlsl/multiple-rt.shader_test index 85bfd269..23c661b3 100644 --- a/tests/hlsl/multiple-rt.shader_test +++ b/tests/hlsl/multiple-rt.shader_test @@ -15,5 +15,5 @@ void main(out float4 o0 : sv_target0, out float4 o1 : sv_target1) [test] draw quad -probe render target 0 all rgba (0.1, 0.2, 0.3, 0.4) -probe render target 1 all rgba (0.5, 0.6, 0.7, 0.8) +probe rtv 0 all rgba (0.1, 0.2, 0.3, 0.4) +probe rtv 1 all rgba (0.5, 0.6, 0.7, 0.8) diff --git a/tests/hlsl/uav-rwbuffer.shader_test b/tests/hlsl/uav-rwbuffer.shader_test index bbc48ee8..ec8937b3 100644 --- a/tests/hlsl/uav-rwbuffer.shader_test +++ b/tests/hlsl/uav-rwbuffer.shader_test @@ -179,4 +179,4 @@ float4 main() : sv_target1 [test] todo(sm>=6) draw quad -probe buffer uav 2 (0, 0) rgba (11.1, 12.2, 13.3, 14.4) +probe uav 2 (0) rgba (11.1, 12.2, 13.3, 14.4) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index b20bf9a2..3fa00101 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -842,17 +842,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) resource = shader_runner_get_resource(runner, RESOURCE_TYPE_UAV, slot); } - else if (match_string(line, "buffer uav", &line)) - { - slot = strtoul(line, &rest, 10); - - if (rest == line) - fatal_error("Malformed buffer UAV index '%s'.\n", line); - line = rest; - - resource = shader_runner_get_resource(runner, RESOURCE_TYPE_UAV, slot); - } - else if (match_string(line, "render target", &line)) + else if (match_string(line, "rtv", &line)) { slot = strtoul(line, &rest, 10); @@ -883,6 +873,11 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) set_rect(&rect, left, top, left + 1, top + 1); line += len; } + else if (sscanf(line, " ( %u )%n", &left, &len) == 1) + { + set_rect(&rect, left, 0, left + 1, 1); + line += len; + } else { fatal_error("Malformed probe arguments '%s'.\n", line);

1 0

Francisco Casas : vkd3d-shader/hlsl: Parse Buffer types.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: vkd3d Branch: master Commit: c249461e9706b97d8542f74461d162195c5ded5e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c249461e9706b97d8542f74461d16… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jan 24 16:35:39 2024 -0300 vkd3d-shader/hlsl: Parse Buffer types. --- libs/vkd3d-shader/hlsl.c | 11 +++++++++-- libs/vkd3d-shader/hlsl.y | 29 +++++++++++++++++------------ libs/vkd3d-shader/tpf.c | 7 +++++++ tests/hlsl/srv-buffers.shader_test | 28 ++++++++++++++-------------- 4 files changed, 47 insertions(+), 28 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 3d068ac6..6af62784 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2192,9 +2192,16 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru return string; } - assert(type->sampler_dim < ARRAY_SIZE(dimensions)); assert(type->e.resource_format->base_type < ARRAY_SIZE(base_types)); - vkd3d_string_buffer_printf(string, "Texture%s", dimensions[type->sampler_dim]); + if (type->sampler_dim == HLSL_SAMPLER_DIM_BUFFER) + { + vkd3d_string_buffer_printf(string, "Buffer"); + } + else + { + assert(type->sampler_dim < ARRAY_SIZE(dimensions)); + vkd3d_string_buffer_printf(string, "Texture%s", dimensions[type->sampler_dim]); + } if ((inner_string = hlsl_type_to_string(ctx, type->e.resource_format))) { vkd3d_string_buffer_printf(string, "<%s>", inner_string->buffer); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index f4c9a17b..3da3d00b 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4229,6 +4229,7 @@ static unsigned int hlsl_offset_dim_count(enum hlsl_sampler_dim dim) return 3; case HLSL_SAMPLER_DIM_CUBE: case HLSL_SAMPLER_DIM_CUBEARRAY: + case HLSL_SAMPLER_DIM_BUFFER: /* Offset parameters not supported for these types. */ return 0; default: @@ -4257,10 +4258,9 @@ static bool add_load_method_call(struct hlsl_ctx *ctx, struct hlsl_block *block, struct hlsl_ir_node *load; bool multisampled; - if (object_type->sampler_dim == HLSL_SAMPLER_DIM_BUFFER - || object_type->sampler_dim == HLSL_SAMPLER_DIM_STRUCTURED_BUFFER) + if (object_type->sampler_dim == HLSL_SAMPLER_DIM_STRUCTURED_BUFFER) { - hlsl_fixme(ctx, loc, "Method '%s' for buffers.", name); + hlsl_fixme(ctx, loc, "Method '%s' for structured buffers.", name); return false; } @@ -4270,13 +4270,14 @@ static bool add_load_method_call(struct hlsl_ctx *ctx, struct hlsl_block *block, multisampled = object_type->sampler_dim == HLSL_SAMPLER_DIM_2DMS || object_type->sampler_dim == HLSL_SAMPLER_DIM_2DMSARRAY; - if (params->args_count < 1 + multisampled || params->args_count > 3 + multisampled) + if (params->args_count < 1 + multisampled || params->args_count > 2 + multisampled + !!offset_dim) { hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, "Wrong number of arguments to method 'Load': expected between %u and %u, but got %u.", - 1 + multisampled, 3 + multisampled, params->args_count); + 1 + multisampled, 2 + multisampled + !!offset_dim, params->args_count); return false; } + if (multisampled) { if (!(load_params.sample_index = add_implicit_conversion(ctx, block, params->args[1], @@ -4284,14 +4285,14 @@ static bool add_load_method_call(struct hlsl_ctx *ctx, struct hlsl_block *block, return false; } - assert(offset_dim); - if (params->args_count > 1 + multisampled) + if (!!offset_dim && params->args_count > 1 + multisampled) { if (!(load_params.texel_offset = add_implicit_conversion(ctx, block, params->args[1 + multisampled], hlsl_get_vector_type(ctx, HLSL_TYPE_INT, offset_dim), loc))) return false; } - if (params->args_count > 2 + multisampled) + + if (params->args_count > 1 + multisampled + !!offset_dim) { hlsl_fixme(ctx, loc, "Tiled resource status argument."); } @@ -4602,13 +4603,13 @@ static bool add_getdimensions_method_call(struct hlsl_ctx *ctx, struct hlsl_bloc { HLSL_SAMPLER_DIM_CUBEARRAY, 5, { ARG_MIP_LEVEL, ARG_WIDTH, ARG_HEIGHT, ARG_ELEMENT_COUNT, ARG_LEVEL_COUNT } }, { HLSL_SAMPLER_DIM_2DMS, 3, { ARG_WIDTH, ARG_HEIGHT, ARG_SAMPLE_COUNT } }, { HLSL_SAMPLER_DIM_2DMSARRAY, 4, { ARG_WIDTH, ARG_HEIGHT, ARG_ELEMENT_COUNT, ARG_SAMPLE_COUNT } }, + { HLSL_SAMPLER_DIM_BUFFER, 1, { ARG_WIDTH} }, }; const struct overload *o = NULL; - if (object_type->sampler_dim == HLSL_SAMPLER_DIM_BUFFER - || object_type->sampler_dim == HLSL_SAMPLER_DIM_STRUCTURED_BUFFER) + if (object_type->sampler_dim == HLSL_SAMPLER_DIM_STRUCTURED_BUFFER) { - hlsl_fixme(ctx, loc, "Method '%s' for buffers.", name); + hlsl_fixme(ctx, loc, "Method '%s' for structured buffers.", name); return false; } @@ -6024,7 +6025,11 @@ parameter: } texture_type: - KW_TEXTURE1D + KW_BUFFER + { + $$ = HLSL_SAMPLER_DIM_BUFFER; + } + | KW_TEXTURE1D { $$ = HLSL_SAMPLER_DIM_1D; } diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index f70606e6..d4a00a69 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -4764,6 +4764,13 @@ static void write_sm4_resinfo(const struct tpf_writer *tpf, const struct hlsl_ir const struct hlsl_ir_node *dst = &load->node; struct sm4_instruction instr; + if (resource->data_type->sampler_dim == HLSL_SAMPLER_DIM_BUFFER + || resource->data_type->sampler_dim == HLSL_SAMPLER_DIM_STRUCTURED_BUFFER) + { + hlsl_fixme(tpf->ctx, &load->node.loc, "resinfo for buffers."); + return; + } + assert(dst->data_type->base_type == HLSL_TYPE_UINT || dst->data_type->base_type == HLSL_TYPE_FLOAT); memset(&instr, 0, sizeof(instr)); diff --git a/tests/hlsl/srv-buffers.shader_test b/tests/hlsl/srv-buffers.shader_test index 7ddfdeed..8ba73cc8 100644 --- a/tests/hlsl/srv-buffers.shader_test +++ b/tests/hlsl/srv-buffers.shader_test @@ -10,7 +10,7 @@ size (buffer, 4) 12.0 13.0 14.0 15.0 -[pixel shader todo] +[pixel shader] float4 a; Buffer<float4> buffer; float4 b; @@ -23,11 +23,11 @@ float4 main() : sv_target [test] uniform 0 float4 100 200 300 400 uniform 4 float4 1000 2000 3000 4000 -todo(sm<6) draw quad +draw quad probe all rgba (200, 3000, 4, 7) -[pixel shader todo] +[pixel shader] float4 a; Buffer<float3> buffer; float4 b; @@ -40,7 +40,7 @@ float4 main() : sv_target [test] uniform 0 float4 100 200 300 400 uniform 4 float4 1000 2000 3000 4000 -todo(sm<6) draw quad +draw quad probe all rgba (4000.0, 8.0, 9.0, 10.0) @@ -56,7 +56,7 @@ address clamp clamp clamp size (buffer, 1) 1.0 2.0 3.0 4.0 -[pixel shader todo] +[pixel shader] Texture2D tex; sampler sam; Buffer<float4> buffer; @@ -67,7 +67,7 @@ float4 main() : sv_target } [test] -todo(sm<6) draw quad +draw quad probe all rgba (3.0, 4.0, -1.0, -1.0) @@ -79,7 +79,7 @@ size (buffer, 4) 12.0 13.0 14.0 15.0 -[pixel shader todo] +[pixel shader] Buffer buffer; float4 main() : sv_target @@ -88,11 +88,11 @@ float4 main() : sv_target } [test] -todo(sm<6) draw quad +draw quad probe all rgba (4.0, 5.0, 6.0, 7.0) -[pixel shader todo] +[pixel shader] Buffer buffer; float4 main() : sv_target @@ -101,7 +101,7 @@ float4 main() : sv_target } [test] -todo(sm<6) draw quad +draw quad probe all rgba (8.0, 9.0, 10.0, 11.0) @@ -127,7 +127,7 @@ float4 main() : sv_target } -[pixel shader todo] +[pixel shader] Buffer buf; uniform int u; @@ -138,15 +138,15 @@ float4 main() : sv_target [test] uniform 0 int 2 -todo(sm<6) draw quad +draw quad probe all rgba (8.0, 9.0, 10.0, 11.0) uniform 0 int 0 -todo(sm<6) draw quad +draw quad probe all rgba (0.0, 1.0, 2.0, 3.0) % Buffer doesn't have offset_dim or sample_index arguments allowed. -[pixel shader fail] +[pixel shader fail todo] Buffer buffer; float4 main() : sv_target

1 0