tests: Support using the Agility SDK in the crosstests.

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

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