- Wine-Commits - list.winehq.org

Tim Clem : msvcrt: Promote the log from _wassert from a trace to an error.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: ec449cfdeb6b287611d56dce8e6f0d9493431e54 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec449cfdeb6b287611d56dce8e6f0d… Author: Tim Clem <tclem(a)codeweavers.com> Date: Mon Oct 30 11:27:55 2023 -0700 msvcrt: Promote the log from _wassert from a trace to an error. --- dlls/msvcrt/exit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 3a7b5ae0330..cf1e7caeb06 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -292,7 +292,7 @@ unsigned int CDECL _set_abort_behavior(unsigned int flags, unsigned int mask) */ void DECLSPEC_NORETURN CDECL _wassert(const wchar_t* str, const wchar_t* file, unsigned int line) { - TRACE("(%s,%s,%d)\n", debugstr_w(str), debugstr_w(file), line); + ERR("(%s,%s,%d)\n", debugstr_w(str), debugstr_w(file), line); if ((MSVCRT_error_mode == _OUT_TO_MSGBOX) || ((MSVCRT_error_mode == _OUT_TO_DEFAULT) && (MSVCRT_app_type == 2)))

1 0

Hans Leidekker : ntdll: Bump current build number to 19043 (Win10 2009).
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: fd00d8e4cc11e494745184897133aff8718316c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/fd00d8e4cc11e494745184897133af… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 30 18:32:18 2023 +0100 ntdll: Bump current build number to 19043 (Win10 2009). Based on Proton commit 0fa76dd66a8. --- dlls/kernel32/version.rc | 10 +++++----- dlls/kernelbase/version.c | 2 +- dlls/ntdll/unix/env.c | 2 +- dlls/ntdll/version.c | 2 +- loader/wine.inf.in | 4 ++-- programs/winecfg/appdefaults.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/version.rc b/dlls/kernel32/version.rc index b6002f51f7a..f91262dfa8e 100644 --- a/dlls/kernel32/version.rc +++ b/dlls/kernel32/version.rc @@ -25,10 +25,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT #define WINE_FILEDESCRIPTION_STR "Wine kernel DLL" #define WINE_FILENAME_STR "kernel32.dll" -/* these values come from Windows 10 Version 1909 */ -#define WINE_FILEVERSION 10,0,18362,1350 -#define WINE_FILEVERSION_STR "10.0.18362.1350" -#define WINE_PRODUCTVERSION 10,0,18362,1350 -#define WINE_PRODUCTVERSION_STR "10.0.18362.1350" +/* these values come from Windows 10 Version 2009 */ +#define WINE_FILEVERSION 10,0,19043,1466 +#define WINE_FILEVERSION_STR "10.0.19043.1466" +#define WINE_PRODUCTVERSION 10,0,19043,1466 +#define WINE_PRODUCTVERSION_STR "10.0.19043.1466" #include "wine/wine_common_ver.rc" diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index 4631ac8d0bc..0636634badb 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -154,7 +154,7 @@ static const struct }, /* Windows 10 */ { - { 10, 0, 18362 }, + { 10, 0, 19043 }, {0x8e0f7a12,0xbfb3,0x4fe8,{0xb9,0xa5,0x48,0xfd,0x50,0xa1,0x5a,0x9a}} } }; diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 80f151c4cb9..f845d2372e1 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1851,7 +1851,7 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module ) peb->ProcessParameters = params; peb->OSMajorVersion = 10; peb->OSMinorVersion = 0; - peb->OSBuildNumber = 18362; + peb->OSBuildNumber = 19043; peb->OSPlatformId = VER_PLATFORM_WIN32_NT; peb->ImageSubSystem = main_image_info.SubSystemType; peb->ImageSubSystemMajorVersion = main_image_info.MajorSubsystemVersion; diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 9c396598d4e..71f5b74bb5a 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -168,7 +168,7 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }, /* WIN10 */ { - sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 18362, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 19043, VER_PLATFORM_WIN32_NT, L"", 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, /* WIN11 */ diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 382808c4876..255ea807d7d 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2502,8 +2502,8 @@ HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Ca HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.3" HKLM,%CurrentVersionNT%,"CurrentMajorVersionNumber",0x10003,10 HKLM,%CurrentVersionNT%,"CurrentMinorVersionNumber",0x10003,0 -HKLM,%CurrentVersionNT%,"CurrentBuild",2,"18362" -HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"18362" +HKLM,%CurrentVersionNT%,"CurrentBuild",2,"19043" +HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"19043" HKLM,%CurrentVersionNT%,"CurrentType",2,"Multiprocessor Free" HKLM,%CurrentVersionNT%,"DigitalProductId",1,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index b7a2dc44038..4900c1e14fd 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -51,7 +51,7 @@ struct win_version static const struct win_version win_versions[] = { { L"win11", L"Windows 11", L"6.3", 10, 0, 22000, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, - { L"win10", L"Windows 10", L"6.3", 10, 0, 18362, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, + { L"win10", L"Windows 10", L"6.3", 10, 0, 19043, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, { L"win81", L"Windows 8.1", NULL, 6, 3, 9600, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, { L"win8", L"Windows 8", NULL, 6, 2, 9200, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, { L"win2008r2", L"Windows 2008 R2", NULL, 6, 1, 7601, VER_PLATFORM_WIN32_NT, L"Service Pack 1", 1, 0, L"ServerNT"},

1 0

Alex Henrie : d3d10core/tests: Use CRT allocation functions.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: b99ea5133196f29f50ecf160ff855ebc26a8ede8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b99ea5133196f29f50ecf160ff855e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 10:16:43 2023 -0600 d3d10core/tests: Use CRT allocation functions. --- dlls/d3d10core/tests/d3d10core.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index a8283da9c18..e885b8678bf 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -23,7 +23,6 @@ #define COBJMACROS #include "initguid.h" #include "d3d11_4.h" -#include "wine/heap.h" #include "wine/wined3d.h" #include "wine/test.h" @@ -88,7 +87,7 @@ static void queue_test(void (*test)(void)) if (mt_test_count >= mt_tests_size) { mt_tests_size = max(16, mt_tests_size * 2); - mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); + mt_tests = realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); } mt_tests[mt_test_count++].test = test; } @@ -126,7 +125,7 @@ static void run_queued_tests(void) GetSystemInfo(&si); thread_count = si.dwNumberOfProcessors; - threads = heap_calloc(thread_count, sizeof(*threads)); + threads = calloc(thread_count, sizeof(*threads)); for (i = 0, test_idx = 0; i < thread_count; ++i) { threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); @@ -137,7 +136,7 @@ static void run_queued_tests(void) { CloseHandle(threads[i]); } - heap_free(threads); + free(threads); } static void set_box(D3D10_BOX *box, UINT left, UINT top, UINT front, UINT right, UINT bottom, UINT back) @@ -3249,7 +3248,7 @@ static void test_render_target_views(void) texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; - data = heap_alloc_zero(texture_desc.Width * texture_desc.Height * 4); + data = calloc(texture_desc.Width * texture_desc.Height, 4); ok(!!data, "Failed to allocate memory.\n"); for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -3290,7 +3289,7 @@ static void test_render_target_views(void) ID3D10Texture2D_Release(texture); } - heap_free(data); + free(data); release_test_context(&test_context); } @@ -10441,7 +10440,7 @@ static void test_resource_access(void) data.SysMemPitch = 0; data.SysMemSlicePitch = 0; - data.pSysMem = heap_alloc(10240); + data.pSysMem = malloc(10240); ok(!!data.pSysMem, "Failed to allocate memory.\n"); for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -10588,7 +10587,7 @@ static void test_resource_access(void) } } - heap_free((void *)data.pSysMem); + free((void *)data.pSysMem); refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %lu references left.\n", refcount); @@ -15036,7 +15035,7 @@ static void test_buffer_srv(void) resource_data.SysMemSlicePitch = 0; if (current_buffer->data_offset) { - data = heap_alloc_zero(current_buffer->byte_count); + data = calloc(1, current_buffer->byte_count); ok(!!data, "Failed to allocate memory.\n"); memcpy(data + current_buffer->data_offset, current_buffer->data, current_buffer->byte_count - current_buffer->data_offset); @@ -15048,7 +15047,7 @@ static void test_buffer_srv(void) } hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &resource_data, &buffer); ok(SUCCEEDED(hr), "Test %u: Failed to create buffer, hr %#lx.\n", i, hr); - heap_free(data); + free(data); } else { @@ -16100,7 +16099,7 @@ static void test_depth_bias(void) rasterizer_desc.SlopeScaledDepthBias = 0.0f; rasterizer_desc.DepthClipEnable = TRUE; - depth_values = heap_calloc(swapchain_desc.height, sizeof(*depth_values)); + depth_values = calloc(swapchain_desc.height, sizeof(*depth_values)); ok(!!depth_values, "Failed to allocate memory.\n"); for (format_idx = 0; format_idx < ARRAY_SIZE(formats); ++format_idx) @@ -16307,7 +16306,7 @@ static void test_depth_bias(void) winetest_pop_context(); } - heap_free(depth_values); + free(depth_values); release_test_context(&test_context); } @@ -17301,7 +17300,7 @@ static void test_generate_mips(void) device = test_context.device; - data = heap_alloc(sizeof(*data) * 32 * 32 * 32); + data = malloc(sizeof(*data) * 32 * 32 * 32); for (z = 0; z < 32; ++z) { @@ -17328,7 +17327,7 @@ static void test_generate_mips(void) } } - zero_data = heap_alloc_zero(sizeof(*zero_data) * 16 * 16 * 16); + zero_data = calloc(16 * 16 * 16, sizeof(*zero_data)); for (i = 0; i < ARRAY_SIZE(resource_types); ++i) { @@ -17472,8 +17471,8 @@ static void test_generate_mips(void) if (is_warp_device(device)) { win_skip("Creating the next texture crashes WARP on some testbot boxes.\n"); - heap_free(zero_data); - heap_free(data); + free(zero_data); + free(data); release_test_context(&test_context); return; } @@ -17541,8 +17540,8 @@ static void test_generate_mips(void) ID3D10Resource_Release(resource); - heap_free(zero_data); - heap_free(data); + free(zero_data); + free(data); release_test_context(&test_context); } @@ -19069,7 +19068,7 @@ static void test_texture_compressed_3d(void) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Simply test all combinations of r0 and r1. */ - texture_data = heap_alloc(256 * 256 * sizeof(UINT64)); + texture_data = malloc(256 * 256 * sizeof(UINT64)); for (r1 = 0; r1 < 256; ++r1) { for (r0 = 0; r0 < 256; ++r0) @@ -19094,7 +19093,7 @@ static void test_texture_compressed_3d(void) texture_desc.MiscFlags = 0; hr = ID3D10Device_CreateTexture3D(device, &texture_desc, &resource_data, &texture); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - heap_free(texture_data); + free(texture_data); hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &srv); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

1 0

Alex Henrie : d3d8: Use CRT allocation functions.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: a70e3059c66a375d6757af4ec60a4b2e11896be5 URL: https://gitlab.winehq.org/wine/wine/-/commit/a70e3059c66a375d6757af4ec60a4b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 10:28:54 2023 -0600 d3d8: Use CRT allocation functions. --- dlls/d3d8/buffer.c | 4 +-- dlls/d3d8/d3d8_main.c | 8 +++--- dlls/d3d8/d3d8_private.h | 1 - dlls/d3d8/device.c | 64 +++++++++++++++++++++---------------------- dlls/d3d8/directx.c | 10 +++---- dlls/d3d8/shader.c | 8 +++--- dlls/d3d8/surface.c | 4 +-- dlls/d3d8/swapchain.c | 6 ++-- dlls/d3d8/texture.c | 2 +- dlls/d3d8/vertexdeclaration.c | 14 +++++----- dlls/d3d8/volume.c | 2 +- 11 files changed, 61 insertions(+), 62 deletions(-)

1 0

Alex Henrie : d3d11/tests: Use CRT allocation functions.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: f2d173479413bb8ce121615f0d4021e8bf63a21e URL: https://gitlab.winehq.org/wine/wine/-/commit/f2d173479413bb8ce121615f0d4021… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 10:17:19 2023 -0600 d3d11/tests: Use CRT allocation functions. --- dlls/d3d11/tests/d3d11.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1b33664befd..984bb845aad 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -26,7 +26,6 @@ #include "initguid.h" #include "d3d11_4.h" #include "winternl.h" -#include "wine/heap.h" #include "wine/wined3d.h" #include "wine/test.h" @@ -135,7 +134,7 @@ static void queue_test_entry(const struct test_entry *t) if (mt_test_count >= mt_tests_size) { mt_tests_size = max(16, mt_tests_size * 2); - mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*t)); + mt_tests = realloc(mt_tests, mt_tests_size * sizeof(*t)); } mt_tests[mt_test_count++] = *t; } @@ -205,7 +204,7 @@ static void run_queued_tests(void) GetSystemInfo(&si); thread_count = si.dwNumberOfProcessors; - threads = heap_calloc(thread_count, sizeof(*threads)); + threads = calloc(thread_count, sizeof(*threads)); for (i = 0, test_idx = 0; i < thread_count; ++i) { threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); @@ -216,7 +215,7 @@ static void run_queued_tests(void) { CloseHandle(threads[i]); } - heap_free(threads); + free(threads); } static void set_box(D3D11_BOX *box, UINT left, UINT top, UINT front, UINT right, UINT bottom, UINT back) @@ -11473,7 +11472,7 @@ static void test_render_target_views(void) texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; - data = heap_alloc_zero(texture_desc.Width * texture_desc.Height * 4); + data = calloc(texture_desc.Width * texture_desc.Height, 4); ok(!!data, "Failed to allocate memory.\n"); for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -11557,7 +11556,7 @@ static void test_render_target_views(void) ID3D11Resource_Release(resource); } - heap_free(data); + free(data); release_test_context(&test_context); } @@ -15403,7 +15402,7 @@ static void test_resource_access(const D3D_FEATURE_LEVEL feature_level) data.SysMemPitch = 0; data.SysMemSlicePitch = 0; - data.pSysMem = heap_alloc(10240); + data.pSysMem = malloc(10240); ok(!!data.pSysMem, "Failed to allocate memory.\n"); for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -15588,7 +15587,7 @@ static void test_resource_access(const D3D_FEATURE_LEVEL feature_level) } } - heap_free((void *)data.pSysMem); + free((void *)data.pSysMem); ID3D11DeviceContext_Release(context); refcount = ID3D11Device_Release(device); @@ -24691,7 +24690,7 @@ static void test_buffer_srv(void) resource_data.SysMemSlicePitch = 0; if (current_buffer->data_offset) { - data = heap_alloc_zero(current_buffer->byte_count); + data = calloc(1, current_buffer->byte_count); ok(!!data, "Failed to allocate memory.\n"); memcpy(data + current_buffer->data_offset, current_buffer->data, current_buffer->byte_count - current_buffer->data_offset); @@ -24703,7 +24702,7 @@ static void test_buffer_srv(void) } hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &resource_data, &buffer); ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); - heap_free(data); + free(data); } else { @@ -28460,7 +28459,7 @@ static void test_depth_bias(void) rasterizer_desc.SlopeScaledDepthBias = 0.0f; rasterizer_desc.DepthClipEnable = TRUE; - depth_values = heap_calloc(swapchain_desc.height, sizeof(*depth_values)); + depth_values = calloc(swapchain_desc.height, sizeof(*depth_values)); ok(!!depth_values, "Failed to allocate memory.\n"); for (format_idx = 0; format_idx < ARRAY_SIZE(formats); ++format_idx) @@ -28669,7 +28668,7 @@ static void test_depth_bias(void) winetest_pop_context(); } - heap_free(depth_values); + free(depth_values); release_test_context(&test_context); } @@ -30430,7 +30429,7 @@ static void test_generate_mips(void) device = test_context.device; context = test_context.immediate_context; - data = heap_alloc(sizeof(*data) * 32 * 32 * 32); + data = malloc(sizeof(*data) * 32 * 32 * 32); for (z = 0; z < 32; ++z) { @@ -30457,7 +30456,7 @@ static void test_generate_mips(void) } } - zero_data = heap_alloc_zero(sizeof(*zero_data) * 16 * 16 * 16); + zero_data = calloc(16 * 16 * 16, sizeof(*zero_data)); for (i = 0; i < ARRAY_SIZE(resource_types); ++i) { @@ -30659,8 +30658,8 @@ static void test_generate_mips(void) ID3D11Resource_Release(resource); - heap_free(zero_data); - heap_free(data); + free(zero_data); + free(data); release_test_context(&test_context); } @@ -33987,7 +33986,7 @@ static void test_texture_compressed_3d(void) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Simply test all combinations of r0 and r1. */ - texture_data = heap_alloc(256 * 256 * sizeof(UINT64)); + texture_data = malloc(256 * 256 * sizeof(UINT64)); for (r1 = 0; r1 < 256; ++r1) { for (r0 = 0; r0 < 256; ++r0) @@ -34012,7 +34011,7 @@ static void test_texture_compressed_3d(void) texture_desc.MiscFlags = 0; hr = ID3D11Device_CreateTexture3D(device, &texture_desc, &resource_data, &texture); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - heap_free(texture_data); + free(texture_data); hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

1 0

Alex Henrie : d3d8/tests: Use CRT allocation functions.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 6db89702a3f7e7563c96f4ea3836b9cb261a8685 URL: https://gitlab.winehq.org/wine/wine/-/commit/6db89702a3f7e7563c96f4ea3836b9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 10:34:30 2023 -0600 d3d8/tests: Use CRT allocation functions. --- dlls/d3d8/tests/device.c | 43 +++++++++++++++++++++---------------------- dlls/d3d8/tests/stateblock.c | 40 ++++++++++++++++++++-------------------- dlls/d3d8/tests/visual.c | 8 ++++---- 3 files changed, 45 insertions(+), 46 deletions(-)

1 0

Nikolay Sivov : tests: Add some tests for 'technique' token behaviour.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: vkd3d Branch: master Commit: 8e5c8c1725e7292c6e06c8867ba134e26a721512 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8e5c8c1725e7292c6e06c8867ba13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 12 12:51:52 2023 +0200 tests: Add some tests for 'technique' token behaviour. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Makefile.am | 3 + tests/hlsl/technique-fx_2.shader_test | 104 ++++++++++++++++++++++++++++++++++ tests/hlsl/technique-fx_4.shader_test | 83 +++++++++++++++++++++++++++ tests/hlsl/technique-fx_5.shader_test | 83 +++++++++++++++++++++++++++ 4 files changed, 273 insertions(+) diff --git a/Makefile.am b/Makefile.am index a0c3158e..5fbac802 100644 --- a/Makefile.am +++ b/Makefile.am @@ -170,6 +170,9 @@ vkd3d_shader_tests = \ tests/hlsl/swizzle-constant-prop.shader_test \ tests/hlsl/swizzle-matrix.shader_test \ tests/hlsl/swizzles.shader_test \ + tests/hlsl/technique-fx_2.shader_test \ + tests/hlsl/technique-fx_4.shader_test \ + tests/hlsl/technique-fx_5.shader_test \ tests/hlsl/ternary.shader_test \ tests/hlsl/texture-load-offset.shader_test \ tests/hlsl/texture-load-typed.shader_test \ diff --git a/tests/hlsl/technique-fx_2.shader_test b/tests/hlsl/technique-fx_2.shader_test new file mode 100644 index 00000000..149506e6 --- /dev/null +++ b/tests/hlsl/technique-fx_2.shader_test @@ -0,0 +1,104 @@ +[require] +shader model < 3.0 + +[pixel shader fail todo] +float4 main() : sv_target +{ + float4 teChnique = {0, 0, 0, 0}; + return teChnique; +} + +[pixel shader fail] +float4 main() : sv_target +{ + float4 technique10 = {0, 0, 0, 0}; + return technique10; +} + +[pixel shader fail todo] +float4 main() : sv_target +{ + float4 technique11 = {0, 0, 0, 0}; + return technique11; +} + +[pixel shader fail] +typedef float4 technique10; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail todo] +typedef float4 Technique; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader] +typedef float4 Technique10; +typedef float4 Technique11; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader] +float4 main() : sv_target +{ + float4 teChnique10 = {0, 0, 0, 0}; + float4 teChnique11 = {0, 0, 0, 0}; + return teChnique10 + teChnique11; +} + +[pixel shader] +float4 main() : sv_target +{ + float4 teChnique11 = {0, 0, 0, 0}; + return teChnique11; +} + +[effect todo] +technique +{ +} + +technique10 +{ +} + +% Effects without techniques are not allowed for fx_2_0 +[effect fail] +float4 f; + +% fx_5_0 keyword fails with fx_2_0 profile +[effect fail] +technique +{ +} + +technique11 +{ +} + +[effect fail] +technique +{ +} + +tEchnique10 +{ +} + +[effect fail] +technique +{ +} + +tEchnique11 +{ +} diff --git a/tests/hlsl/technique-fx_4.shader_test b/tests/hlsl/technique-fx_4.shader_test new file mode 100644 index 00000000..dd4fdc27 --- /dev/null +++ b/tests/hlsl/technique-fx_4.shader_test @@ -0,0 +1,83 @@ +[require] +shader model >= 4.0 +shader model < 6.0 + +[pixel shader fail todo] +float4 main() : sv_target +{ + float4 teChnique = {0, 0, 0, 0}; + return teChnique; +} + +[pixel shader] +float4 main() : sv_target +{ + float4 teChnique10 = {0, 0, 0, 0}; + return teChnique10; +} + +[pixel shader] +float4 main() : sv_target +{ + float4 teChnique11 = {0, 0, 0, 0}; + return teChnique11; +} + +[effect todo] +technique +{ +} + +technique10 +{ +} + +% Effects without techniques are allowed for fx_4_0+ +[effect todo] +float4 f; + +% fx_2_0 keyword is allowed with fx_4_0+ profiles +[effect todo] +technique +{ +} + +technique11 +{ +} + +[effect fail] +technique +{ +} + +tEchnique10 +{ +} + +[effect fail] +technique +{ +} + +tEchnique11 +{ +} + +[effect fail] +float4 technique; + +[effect fail] +float4 technIque; + +[effect fail] +float4 technique10; + +[effect fail] +float4 technique11; + +[effect todo] +float4 technIque10; + +[effect todo] +float4 technIque11; diff --git a/tests/hlsl/technique-fx_5.shader_test b/tests/hlsl/technique-fx_5.shader_test new file mode 100644 index 00000000..ae253234 --- /dev/null +++ b/tests/hlsl/technique-fx_5.shader_test @@ -0,0 +1,83 @@ +[require] +shader model >= 5.0 +shader model < 6.0 + +[pixel shader fail todo] +float4 main() : sv_target +{ + float4 teChnique = {0, 0, 0, 0}; + return teChnique; +} + +[pixel shader] +float4 main() : sv_target +{ + float4 teChnique10 = {0, 0, 0, 0}; + return teChnique10; +} + +[pixel shader] +float4 main() : sv_target +{ + float4 teChnique11 = {0, 0, 0, 0}; + return teChnique11; +} + +[effect todo] +technique +{ +} + +technique10 +{ +} + +% Effects without techniques are allowed for fx_5_0 +[effect todo] +float4 f; + +% fx_2_0 keyword is allowed with fx_5_0 profiles +[effect todo] +technique +{ +} + +technique11 +{ +} + +[effect fail] +technique +{ +} + +tEchnique10 +{ +} + +[effect fail] +technique +{ +} + +tEchnique11 +{ +} + +[effect fail] +float4 technique; + +[effect fail] +float4 technIque; + +[effect fail] +float4 technique10; + +[effect fail] +float4 technique11; + +[effect todo] +float4 technIque10; + +[effect todo] +float4 technIque11;

1 0

Zebediah Figura : vkd3d-shader/spirv: Use the interpolation mode from the signature.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: vkd3d Branch: master Commit: eef62b95c13a662cdc3d0142789ad37497bada92 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/eef62b95c13a662cdc3d0142789ad… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Oct 16 00:01:41 2023 -0500 vkd3d-shader/spirv: Use the interpolation mode from the signature. --- libs/vkd3d-shader/spirv.c | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 2dab97cc..fca1f248 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4592,8 +4592,7 @@ static unsigned int shader_register_get_io_indices(const struct vkd3d_shader_reg } static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, - const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval, - enum vkd3d_shader_interpolation_mode interpolation_mode) + const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_register *reg = &dst->reg; @@ -4693,7 +4692,7 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, if (component_idx) vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx); - spirv_compiler_emit_interpolation_decorations(compiler, input_id, interpolation_mode); + spirv_compiler_emit_interpolation_decorations(compiler, input_id, signature_element->interpolation_mode); } var_id = input_id; @@ -4806,7 +4805,7 @@ static void spirv_compiler_emit_shader_phase_input(struct spirv_compiler *compil case VKD3DSPR_INPUT: case VKD3DSPR_INCONTROLPOINT: case VKD3DSPR_PATCHCONST: - spirv_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE, VKD3DSIM_NONE); + spirv_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE); return; case VKD3DSPR_PRIMID: spirv_compiler_emit_input_register(compiler, dst); @@ -6089,7 +6088,7 @@ static void spirv_compiler_emit_dcl_input(struct spirv_compiler *compiler, if (spirv_compiler_get_current_shader_phase(compiler)) spirv_compiler_emit_shader_phase_input(compiler, dst); else if (vkd3d_shader_register_is_input(&dst->reg) || dst->reg.type == VKD3DSPR_PATCHCONST) - spirv_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE, VKD3DSIM_NONE); + spirv_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE); else spirv_compiler_emit_input_register(compiler, dst); @@ -6097,25 +6096,11 @@ static void spirv_compiler_emit_dcl_input(struct spirv_compiler *compiler, compiler->use_vocp = true; } -static void spirv_compiler_emit_dcl_input_ps(struct spirv_compiler *compiler, - const struct vkd3d_shader_instruction *instruction) -{ - spirv_compiler_emit_input(compiler, &instruction->declaration.dst, VKD3D_SIV_NONE, instruction->flags); -} - -static void spirv_compiler_emit_dcl_input_ps_sysval(struct spirv_compiler *compiler, - const struct vkd3d_shader_instruction *instruction) -{ - const struct vkd3d_shader_register_semantic *semantic = &instruction->declaration.register_semantic; - - spirv_compiler_emit_input(compiler, &semantic->reg, semantic->sysval_semantic, instruction->flags); -} - static void spirv_compiler_emit_dcl_input_sysval(struct spirv_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { spirv_compiler_emit_input(compiler, &instruction->declaration.register_semantic.reg, - instruction->declaration.register_semantic.sysval_semantic, VKD3DSIM_NONE); + instruction->declaration.register_semantic.sysval_semantic); } static void spirv_compiler_emit_dcl_output(struct spirv_compiler *compiler, @@ -9301,16 +9286,12 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_DCL_TGSM_STRUCTURED: spirv_compiler_emit_dcl_tgsm_structured(compiler, instruction); break; + case VKD3DSIH_DCL_INPUT_PS: case VKD3DSIH_DCL_INPUT: spirv_compiler_emit_dcl_input(compiler, instruction); break; - case VKD3DSIH_DCL_INPUT_PS: - spirv_compiler_emit_dcl_input_ps(compiler, instruction); - break; case VKD3DSIH_DCL_INPUT_PS_SGV: case VKD3DSIH_DCL_INPUT_PS_SIV: - spirv_compiler_emit_dcl_input_ps_sysval(compiler, instruction); - break; case VKD3DSIH_DCL_INPUT_SGV: case VKD3DSIH_DCL_INPUT_SIV: spirv_compiler_emit_dcl_input_sysval(compiler, instruction);

1 0

Zebediah Figura : vkd3d-shader/spirv: Always use the sysval from the signature.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: vkd3d Branch: master Commit: a66acea1b506e29731b8c7ac9d7ca5075e728e3b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a66acea1b506e29731b8c7ac9d7ca… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Oct 16 21:58:03 2023 -0500 vkd3d-shader/spirv: Always use the sysval from the signature. --- libs/vkd3d-shader/spirv.c | 58 +++++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index fca1f248..343be44f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -173,7 +173,13 @@ enum vkd3d_shader_input_sysval_semantic vkd3d_siv_from_sysval_indexed(enum vkd3d { switch (sysval) { + case VKD3D_SHADER_SV_COVERAGE: + case VKD3D_SHADER_SV_DEPTH: + case VKD3D_SHADER_SV_DEPTH_GREATER_EQUAL: + case VKD3D_SHADER_SV_DEPTH_LESS_EQUAL: case VKD3D_SHADER_SV_NONE: + case VKD3D_SHADER_SV_STENCIL_REF: + case VKD3D_SHADER_SV_TARGET: return VKD3D_SIV_NONE; case VKD3D_SHADER_SV_POSITION: return VKD3D_SIV_POSITION; @@ -181,6 +187,16 @@ enum vkd3d_shader_input_sysval_semantic vkd3d_siv_from_sysval_indexed(enum vkd3d return VKD3D_SIV_CLIP_DISTANCE; case VKD3D_SHADER_SV_CULL_DISTANCE: return VKD3D_SIV_CULL_DISTANCE; + case VKD3D_SHADER_SV_INSTANCE_ID: + return VKD3D_SIV_INSTANCE_ID; + case VKD3D_SHADER_SV_IS_FRONT_FACE: + return VKD3D_SIV_IS_FRONT_FACE; + case VKD3D_SHADER_SV_PRIMITIVE_ID: + return VKD3D_SIV_PRIMITIVE_ID; + case VKD3D_SHADER_SV_RENDER_TARGET_ARRAY_INDEX: + return VKD3D_SIV_RENDER_TARGET_ARRAY_INDEX; + case VKD3D_SHADER_SV_SAMPLE_INDEX: + return VKD3D_SIV_SAMPLE_INDEX; case VKD3D_SHADER_SV_TESS_FACTOR_QUADEDGE: return VKD3D_SIV_QUAD_U0_TESS_FACTOR + index; case VKD3D_SHADER_SV_TESS_FACTOR_QUADINT: @@ -193,6 +209,10 @@ enum vkd3d_shader_input_sysval_semantic vkd3d_siv_from_sysval_indexed(enum vkd3d return VKD3D_SIV_LINE_DETAIL_TESS_FACTOR; case VKD3D_SHADER_SV_TESS_FACTOR_LINEDEN: return VKD3D_SIV_LINE_DENSITY_TESS_FACTOR; + case VKD3D_SHADER_SV_VERTEX_ID: + return VKD3D_SIV_VERTEX_ID; + case VKD3D_SHADER_SV_VIEWPORT_ARRAY_INDEX: + return VKD3D_SIV_VIEWPORT_ARRAY_INDEX; default: FIXME("Unhandled sysval %#x, index %u.\n", sysval, index); return VKD3D_SIV_NONE; @@ -4592,7 +4612,7 @@ static unsigned int shader_register_get_io_indices(const struct vkd3d_shader_reg } static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, - const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) + const struct vkd3d_shader_dst_param *dst) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_register *reg = &dst->reg; @@ -4600,6 +4620,7 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, const struct signature_element *signature_element; const struct shader_signature *shader_signature; enum vkd3d_shader_component_type component_type; + enum vkd3d_shader_input_sysval_semantic sysval; uint32_t type_id, ptr_type_id, float_type_id; const struct vkd3d_spirv_builtin *builtin; unsigned int write_mask, reg_write_mask; @@ -4621,10 +4642,12 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, element_idx = shader_register_get_io_indices(reg, array_sizes); signature_element = &shader_signature->elements[element_idx]; - - if ((compiler->shader_type == VKD3D_SHADER_TYPE_HULL || compiler->shader_type == VKD3D_SHADER_TYPE_GEOMETRY) - && !sysval && signature_element->sysval_semantic) - sysval = vkd3d_siv_from_sysval(signature_element->sysval_semantic); + sysval = vkd3d_siv_from_sysval(signature_element->sysval_semantic); + /* The Vulkan spec does not explicitly forbid passing varyings from the + * TCS to the TES via builtins. However, Mesa doesn't seem to handle it + * well, and we don't actually need them to be in builtins. */ + if (compiler->shader_type == VKD3D_SHADER_TYPE_DOMAIN && reg->type != VKD3DSPR_PATCHCONST) + sysval = VKD3D_SIV_NONE; builtin = get_spirv_builtin_for_sysval(compiler, sysval); @@ -4805,7 +4828,7 @@ static void spirv_compiler_emit_shader_phase_input(struct spirv_compiler *compil case VKD3DSPR_INPUT: case VKD3DSPR_INCONTROLPOINT: case VKD3DSPR_PATCHCONST: - spirv_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE); + spirv_compiler_emit_input(compiler, dst); return; case VKD3DSPR_PRIMID: spirv_compiler_emit_input_register(compiler, dst); @@ -4976,8 +4999,7 @@ static uint32_t spirv_compiler_emit_shader_phase_builtin_variable(struct spirv_c return id; } -static void spirv_compiler_emit_output(struct spirv_compiler *compiler, - const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) +static void spirv_compiler_emit_output(struct spirv_compiler *compiler, const struct vkd3d_shader_dst_param *dst) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_register *reg = &dst->reg; @@ -4985,6 +5007,7 @@ static void spirv_compiler_emit_output(struct spirv_compiler *compiler, const struct signature_element *signature_element; enum vkd3d_shader_component_type component_type; const struct shader_signature *shader_signature; + enum vkd3d_shader_input_sysval_semantic sysval; const struct vkd3d_spirv_builtin *builtin; unsigned int write_mask, reg_write_mask; bool use_private_variable = false; @@ -5001,6 +5024,10 @@ static void spirv_compiler_emit_output(struct spirv_compiler *compiler, element_idx = shader_register_get_io_indices(reg, array_sizes); signature_element = &shader_signature->elements[element_idx]; + sysval = vkd3d_siv_from_sysval(signature_element->sysval_semantic); + /* Don't use builtins for TCS -> TES varyings. See spirv_compiler_emit_input(). */ + if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL && !is_patch_constant) + sysval = VKD3D_SIV_NONE; builtin = vkd3d_get_spirv_builtin(compiler, dst->reg.type, sysval); @@ -6088,7 +6115,7 @@ static void spirv_compiler_emit_dcl_input(struct spirv_compiler *compiler, if (spirv_compiler_get_current_shader_phase(compiler)) spirv_compiler_emit_shader_phase_input(compiler, dst); else if (vkd3d_shader_register_is_input(&dst->reg) || dst->reg.type == VKD3DSPR_PATCHCONST) - spirv_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE); + spirv_compiler_emit_input(compiler, dst); else spirv_compiler_emit_input_register(compiler, dst); @@ -6099,8 +6126,7 @@ static void spirv_compiler_emit_dcl_input(struct spirv_compiler *compiler, static void spirv_compiler_emit_dcl_input_sysval(struct spirv_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - spirv_compiler_emit_input(compiler, &instruction->declaration.register_semantic.reg, - instruction->declaration.register_semantic.sysval_semantic); + spirv_compiler_emit_input(compiler, &instruction->declaration.register_semantic.reg); } static void spirv_compiler_emit_dcl_output(struct spirv_compiler *compiler, @@ -6110,7 +6136,7 @@ static void spirv_compiler_emit_dcl_output(struct spirv_compiler *compiler, if (vkd3d_shader_register_is_output(&dst->reg) || (is_in_fork_or_join_phase(compiler) && vkd3d_shader_register_is_patch_constant(&dst->reg))) - spirv_compiler_emit_output(compiler, dst, VKD3D_SIV_NONE); + spirv_compiler_emit_output(compiler, dst); else spirv_compiler_emit_output_register(compiler, dst); } @@ -6118,13 +6144,7 @@ static void spirv_compiler_emit_dcl_output(struct spirv_compiler *compiler, static void spirv_compiler_emit_dcl_output_siv(struct spirv_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - enum vkd3d_shader_input_sysval_semantic sysval; - const struct vkd3d_shader_dst_param *dst; - - dst = &instruction->declaration.register_semantic.reg; - sysval = instruction->declaration.register_semantic.sysval_semantic; - - spirv_compiler_emit_output(compiler, dst, sysval); + spirv_compiler_emit_output(compiler, &instruction->declaration.register_semantic.reg); } static void spirv_compiler_emit_dcl_stream(struct spirv_compiler *compiler,

1 0

Nikolay Sivov : tests: Add [effect] section support.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: vkd3d Branch: master Commit: 214d44fb11c6e425fcb6261f574d558566258461 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/214d44fb11c6e425fcb6261f574d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 12 12:51:19 2023 +0200 tests: Add [effect] section support. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/shader_runner.c | 43 +++++++++++++++++++++++++++++++++++++++++-- tests/shader_runner.h | 2 ++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 59c1408c..dadfe333 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -89,6 +89,8 @@ enum parse_state STATE_SHADER_PIXEL_TODO, STATE_SHADER_VERTEX, STATE_SHADER_VERTEX_TODO, + STATE_SHADER_EFFECT, + STATE_SHADER_EFFECT_TODO, STATE_TEST, }; @@ -814,6 +816,7 @@ const char *shader_type_string(enum shader_type type) [SHADER_TYPE_CS] = "cs", [SHADER_TYPE_PS] = "ps", [SHADER_TYPE_VS] = "vs", + [SHADER_TYPE_FX] = "fx", }; assert(type < ARRAY_SIZE(shader_types)); return shader_types[type]; @@ -953,6 +956,14 @@ static void compile_shader(struct shader_runner *runner, IDxcCompiler3 *dxc_comp [SHADER_MODEL_6_0] = "6_0", }; + static const char *const effect_models[] = + { + [SHADER_MODEL_2_0] = "2_0", + [SHADER_MODEL_4_0] = "4_0", + [SHADER_MODEL_4_1] = "4_1", + [SHADER_MODEL_5_0] = "5_0", + }; + if (use_dxcompiler) { assert(dxc_compiler); @@ -960,7 +971,10 @@ static void compile_shader(struct shader_runner *runner, IDxcCompiler3 *dxc_comp } else { - sprintf(profile, "%s_%s", shader_type_string(type), shader_models[runner->minimum_shader_model]); + if (type == SHADER_TYPE_FX) + sprintf(profile, "%s_%s", shader_type_string(type), effect_models[runner->minimum_shader_model]); + else + sprintf(profile, "%s_%s", shader_type_string(type), shader_models[runner->minimum_shader_model]); hr = D3DCompile(source, len, NULL, NULL, NULL, "main", profile, runner->compile_options, 0, &blob, &errors); } hr = map_unidentified_hrs(hr); @@ -996,8 +1010,10 @@ static enum parse_state read_shader_directive(struct shader_runner *runner, enum state = STATE_SHADER_COMPUTE_TODO; else if (state == STATE_SHADER_PIXEL) state = STATE_SHADER_PIXEL_TODO; - else + else if (state == STATE_SHADER_VERTEX) state = STATE_SHADER_VERTEX_TODO; + else + state = STATE_SHADER_EFFECT_TODO; } else if (match_directive_substring(src, "fail", &src)) { @@ -1136,6 +1152,21 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o shader_source_size = 0; break; + case STATE_SHADER_EFFECT: + case STATE_SHADER_EFFECT_TODO: + if (!skip_tests) + { + todo_if (state == STATE_SHADER_EFFECT_TODO) + compile_shader(runner, dxc_compiler, shader_source, shader_source_len, SHADER_TYPE_FX, + expect_hr); + } + free(runner->fx_source); + runner->fx_source = shader_source; + shader_source = NULL; + shader_source_len = 0; + shader_source_size = 0; + break; + case STATE_PREPROC_INVALID: { ID3D10Blob *blob = NULL, *errors = NULL; @@ -1324,6 +1355,12 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o expect_hr = S_OK; state = read_shader_directive(runner, state, line_buffer, line, &expect_hr); } + else if (match_directive_substring(line, "[effect", &line)) + { + state = STATE_SHADER_EFFECT; + expect_hr = S_OK; + state = read_shader_directive(runner, state, line_buffer, line, &expect_hr); + } else if (!strcmp(line, "[input layout]\n")) { state = STATE_INPUT_LAYOUT; @@ -1355,6 +1392,8 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o case STATE_SHADER_PIXEL_TODO: case STATE_SHADER_VERTEX: case STATE_SHADER_VERTEX_TODO: + case STATE_SHADER_EFFECT: + case STATE_SHADER_EFFECT_TODO: { size_t len = strlen(line); diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 3efbcf36..bda44a42 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -44,6 +44,7 @@ enum shader_type SHADER_TYPE_CS, SHADER_TYPE_PS, SHADER_TYPE_VS, + SHADER_TYPE_FX, }; const char *shader_type_string(enum shader_type type); @@ -118,6 +119,7 @@ struct shader_runner char *vs_source; char *ps_source; char *cs_source; + char *fx_source; enum shader_model minimum_shader_model; enum shader_model maximum_shader_model;

1 0