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

tests: Support using the Agility SDK in the crosstests.

Browse Source
This commit is contained in:
Giovanni Mascellani
2024-05-02 11:56:04 -07:00
committed by Henri Verbeet
parent c49daadce1
commit 4f67675a51
Notes: Henri Verbeet 2024-07-09 20:53:44 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Conor McCarthy (@cmccarthy)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/853
8 changed files with 78 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/d3d12.c
View File

@@ -23,6 +23,8 @@
#include "d3d12_crosstest.h"
VKD3D_AGILITY_SDK_EXPORTS
struct test_options test_options = {0};
static PFN_D3D12_CREATE_VERSIONED_ROOT_SIGNATURE_DESERIALIZER pfn_D3D12CreateVersionedRootSignatureDeserializer;

20
tests/d3d12_crosstest.h
View File

@@ -259,6 +259,24 @@ static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12Comm
}
#ifdef VKD3D_CROSSTEST
#ifdef VKD3D_AGILITY_SDK_VERSION
# define VKD3D_AGILITY_SDK_EXPORT_VERSION \
VKD3D_EXPORT const UINT D3D12SDKVersion = VKD3D_AGILITY_SDK_VERSION;
# ifdef VKD3D_AGILITY_SDK_PATH
# define VKD3D_AGILITY_SDK_EXPORT_PATH \
VKD3D_EXPORT const char *D3D12SDKPath = VKD3D_EXPAND_AND_STRINGIFY(VKD3D_AGILITY_SDK_PATH);
# else
# define VKD3D_AGILITY_SDK_EXPORT_PATH \
VKD3D_EXPORT const char *D3D12SDKPath = ".";
# endif
# define VKD3D_AGILITY_SDK_EXPORTS \
VKD3D_AGILITY_SDK_EXPORT_VERSION \
VKD3D_AGILITY_SDK_EXPORT_PATH
#else
# define VKD3D_AGILITY_SDK_EXPORTS
#endif
static IUnknown *create_warp_adapter(IDXGIFactory4 *factory)
{
IUnknown *adapter;
@@ -505,6 +523,8 @@ static inline bool is_depth_clip_enable_supported(ID3D12Device *device)
#else
#define VKD3D_AGILITY_SDK_EXPORTS
#define DECLARE_VK_PFN(name) static PFN_##name name;
DECLARE_VK_PFN(vkGetInstanceProcAddr)
#define VK_INSTANCE_PFN DECLARE_VK_PFN

2
tests/d3d12_invalid_usage.c
View File

@@ -18,6 +18,8 @@
#include "d3d12_crosstest.h"
VKD3D_AGILITY_SDK_EXPORTS
struct test_options test_options = {0};
#define recreate_command_list(a, b, c) recreate_command_list_(__LINE__, a, b, c)

2
tests/hlsl_d3d12.c
View File

@@ -21,6 +21,8 @@
#include "vkd3d_common.h"
#include "vkd3d_d3d12shader.h"
VKD3D_AGILITY_SDK_EXPORTS
#ifndef D3DERR_INVALIDCALL
#define D3DERR_INVALIDCALL 0x8876086c
#endif

3
tests/shader_runner.c
View File

@@ -2219,6 +2219,9 @@ START_TEST(shader_runner)
print_dll_version("d3d9.dll");
print_dll_version("d3d11.dll");
print_dll_version("d3d12.dll");
print_dll_version("d3d12core.dll");
if (test_options.enable_debug_layer)
print_dll_version("d3d12sdklayers.dll");
#elif defined(_WIN32)
trace("Running tests from a Windows non-cross build\n");

2
tests/shader_runner_d3d12.c
View File

@@ -28,6 +28,8 @@
#include "shader_runner.h"
#include "dxcompiler.h"
VKD3D_AGILITY_SDK_EXPORTS
struct d3d12_resource
{
struct resource r;