mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vkd3d: Support using vkd3d-utils path when testing on Windows. 

When testing vkd3d on Windows, we were only able to use the native D3D12
path. Add an ifdef to configure this.

Signed-off-by: Hans-Kristian Arntzen <post@arntzen-software.no>
This commit is contained in:
Hans-Kristian Arntzen 2019-10-15 16:01:51 +02:00
parent bf2b437346
commit d3c1147923
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/d3d12_crosstest.h
View File

@ -52,17 +52,17 @@ typedef int HRESULT;
#include <math.h>
#include <time.h>
#ifdef _WIN32
#if defined(_WIN32) && !defined(VKD3D_FORCE_UTILS_WRAPPER)
# include "vkd3d_dxgi1_4.h"
#else
# include <pthread.h>
# include "vkd3d_threads.h"
# include "vkd3d.h"
# include "vkd3d_utils.h"
#endif
#include "d3d12_test_utils.h"
#ifdef _WIN32
#if defined(_WIN32) && !defined(VKD3D_FORCE_UTILS_WRAPPER)
static inline HANDLE create_event(void)
{
return CreateEventA(NULL, FALSE, FALSE, NULL);
@ -124,7 +124,7 @@ struct test_thread_data
void *user_data;
};
#ifdef _WIN32
#if defined(_WIN32) && !defined(VKD3D_FORCE_UTILS_WRAPPER)
static inline DWORD WINAPI test_thread_main(void *untyped_data)
{
struct test_thread_data *data = untyped_data;
@ -242,7 +242,7 @@ static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12Comm
static bool use_warp_device;
static unsigned int use_adapter_idx;
#ifdef _WIN32
#if defined(_WIN32) && !defined(VKD3D_FORCE_UTILS_WRAPPER)
static IUnknown *create_warp_adapter(IDXGIFactory4 *factory)
{
IUnknown *adapter;