From 1c3e3b73b08590711f8c7f3ff4932c8b0c22f200 Mon Sep 17 00:00:00 2001 From: Hans-Kristian Arntzen Date: Thu, 22 Sep 2022 12:42:24 +0200 Subject: tests: Add shader-api tests to build system. Fix some build issues as well. Signed-off-by: Hans-Kristian Arntzen --- tests/meson.build | 8 ++++++++ tests/vkd3d_shader_api.c | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/meson.build b/tests/meson.build index 1e25ce11..41d55cb0 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -62,3 +62,11 @@ executable('descriptor-performance', 'descriptor_performance.c', c_args : vkd3d_test_flags, override_options : [ 'c_std='+vkd3d_c_std ], link_with : [ d3d12_test_utils_lib ]) + +executable('shader-api', 'vkd3d_shader_api.c', + dependencies : [ vkd3d_test_deps, vkd3d_shader_dep ], + include_directories : vkd3d_private_includes, + install : false, + c_args : vkd3d_test_flags, + override_options : [ 'c_std='+vkd3d_c_std ], + link_with : [ d3d12_test_utils_lib ]) diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 709a103f..6940488e 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define VKD3D_DBG_CHANNEL VKD3D_DBG_CHANNEL_API +#define INITGUID +#define VKD3D_TEST_DECLARE_MAIN #include "vkd3d_test.h" #include @@ -65,6 +68,7 @@ static void test_vkd3d_shader_pfns(void) PFN_vkd3d_shader_free_shader_code pfn_vkd3d_shader_free_shader_code; PFN_vkd3d_shader_compile_dxbc pfn_vkd3d_shader_compile_dxbc; PFN_vkd3d_shader_scan_dxbc pfn_vkd3d_shader_scan_dxbc; + vkd3d_shader_hash_t compat_hash; struct vkd3d_versioned_root_signature_desc root_signature_desc; struct vkd3d_shader_signature_element *element; @@ -107,7 +111,7 @@ static void test_vkd3d_shader_pfns(void) rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, &dxbc); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); - rc = pfn_vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc); + rc = pfn_vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc, &compat_hash); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); pfn_vkd3d_shader_free_root_signature(&root_signature_desc); pfn_vkd3d_shader_free_shader_code(&dxbc); -- cgit v1.2.3