wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

tests/shader_runner: Slightly simplify dxc handling.

Browse Source
This commit is contained in:
Henri Verbeet 2024-11-06 15:11:30 +01:00
parent 2996ad6bd2
commit 92fa68cb07
Notes: Henri Verbeet 2024-11-13 16:30:53 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1258
1 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tests/shader_runner.c
View File

@ -2389,26 +2389,21 @@ out:
START_TEST(shader_runner) START_TEST(shader_runner)
{ {
IDxcCompiler3 *dxc_compiler; IDxcCompiler3 *dxc;
parse_args(argc, argv); parse_args(argc, argv);
dxc = dxcompiler_create();
#if defined(VKD3D_CROSSTEST) #if defined(VKD3D_CROSSTEST)
trace("Running tests from a Windows cross build\n"); trace("Running tests from a Windows cross build\n");
run_shader_tests_d3d9(); run_shader_tests_d3d9();
run_shader_tests_d3d11(); run_shader_tests_d3d11();
run_shader_tests_d3d12(dxc);
dxc_compiler = dxcompiler_create(); if (dxc)
run_shader_tests_d3d12(dxc_compiler);
if (dxc_compiler)
{
IDxcCompiler3_Release(dxc_compiler);
print_dll_version("dxcompiler.dll"); print_dll_version("dxcompiler.dll");
}
print_dll_version("d3dcompiler_47.dll"); print_dll_version("d3dcompiler_47.dll");
print_dll_version("dxgi.dll"); print_dll_version("dxgi.dll");
print_dll_version("d3d9.dll"); print_dll_version("d3d9.dll");
@ -2423,17 +2418,11 @@ START_TEST(shader_runner)
trace("Running tests from a Windows non-cross build\n"); trace("Running tests from a Windows non-cross build\n");
run_shader_tests_d3d9(); run_shader_tests_d3d9();
run_shader_tests_d3d11(); run_shader_tests_d3d11();
run_shader_tests_d3d12(dxc);
dxc_compiler = dxcompiler_create(); if (dxc)
run_shader_tests_d3d12(dxc_compiler);
if (dxc_compiler)
{
IDxcCompiler3_Release(dxc_compiler);
print_dll_version(SONAME_LIBDXCOMPILER); print_dll_version(SONAME_LIBDXCOMPILER);
}
print_dll_version("d3d9.dll"); print_dll_version("d3d9.dll");
print_dll_version("d3d11.dll"); print_dll_version("d3d11.dll");
@ -2447,12 +2436,9 @@ START_TEST(shader_runner)
run_shader_tests_metal(); run_shader_tests_metal();
# endif # endif
run_shader_tests_vulkan(); run_shader_tests_vulkan();
run_shader_tests_d3d12(dxc);
dxc_compiler = dxcompiler_create();
run_shader_tests_d3d12(dxc_compiler);
if (dxc_compiler)
IDxcCompiler3_Release(dxc_compiler);
#endif #endif
if (dxc)
IDxcCompiler3_Release(dxc);
} }