wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Enable DXIL support in the default configuration.

Browse Source
This commit is contained in:
Henri Verbeet
2025-02-05 20:32:27 +01:00
parent 73c0356861
commit 1fd89abcc3
Notes: Henri Verbeet 2025-02-24 16:26:28 +01:00 
Approved-by: Conor McCarthy (@cmccarthy)
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1371
9 changed files with 3 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/shader_runner_d3d12.c
View File

@@ -1093,12 +1093,7 @@ static void run_shader_tests_for_model_range(void *dxc_compiler,
if (minimum_shader_model >= SHADER_MODEL_6_0 && !device_supports_shader_model_6_0(device))
{
#ifdef VKD3D_CROSSTEST
skip("The device does not support shader model 6.0.\n");
#else
skip("DXIL support is not enabled. If this is unintentional, "
"add -DVKD3D_SHADER_UNSUPPORTED_DXIL to CPPFLAGS.\n");
#endif
destroy_test_context(&runner.test_context);
return;
}

17
tests/vkd3d_shader_api.c
View File

@@ -29,21 +29,6 @@
#include <locale.h>
static bool check_dxil_support(void)
{
const enum vkd3d_shader_source_type *source_types;
unsigned int count, i;
source_types = vkd3d_shader_get_supported_source_types(&count);
for (i = 0; i < count; ++i)
{
if (source_types[i] == VKD3D_SHADER_SOURCE_DXBC_DXIL)
return true;
}
return false;
}
static void test_invalid_shaders(void)
{
struct vkd3d_shader_compile_info info;
@@ -949,7 +934,7 @@ static void test_scan_signatures(void)
vkd3d_test_pop_context();
}
if (!check_dxil_support() || !(compiler = dxcompiler_create()))
if (!(compiler = dxcompiler_create()))
{
skip("DXIL tests not supported.\n");
return;