wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

tests: Distinguish between cross and non-cross Win32 builds.

Browse Source 
Now the tests compile correctly on non-cross Win32 builds.
This commit is contained in:
Giovanni Mascellani 2023-01-18 14:31:07 +01:00 committed by Alexandre Julliard
parent 9c817e5e6d
commit 44d9e2d728
Notes: Alexandre Julliard 2023-01-24 22:27:46 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/57
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -414,7 +414,7 @@ dummy-vkd3d-version:
## Cross-compile tests ## Cross-compile tests
cross_implibs = crosslibs/d3d12 cross_implibs = crosslibs/d3d12
CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/include CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/include
CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=0 CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=0 -DVKD3D_CROSSTEST=1
EXTRA_DIST += $(cross_implibs:=.cross32.def) $(cross_implibs:=.cross64.def) EXTRA_DIST += $(cross_implibs:=.cross32.def) $(cross_implibs:=.cross64.def)
EXTRA_DIST += tests/shader_runner_d3d11.c tests/shader_runner_d3d9.c EXTRA_DIST += tests/shader_runner_d3d11.c tests/shader_runner_d3d9.c

4
tests/d3d12_crosstest.h
View File

@ -56,7 +56,7 @@ typedef int HRESULT;
#include <stddef.h> #include <stddef.h>
#include <time.h> #include <time.h>
#ifdef _WIN32 #ifdef VKD3D_CROSSTEST
# include "vkd3d_dxgi1_4.h" # include "vkd3d_dxgi1_4.h"
#else #else
# define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_2 # define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_2
@ -261,7 +261,7 @@ static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12Comm
static bool use_warp_device; static bool use_warp_device;
static unsigned int use_adapter_idx; static unsigned int use_adapter_idx;
#ifdef _WIN32 #ifdef VKD3D_CROSSTEST
static IUnknown *create_warp_adapter(IDXGIFactory4 *factory) static IUnknown *create_warp_adapter(IDXGIFactory4 *factory)
{ {
IUnknown *adapter; IUnknown *adapter;

2
tests/shader_runner.c
View File

@ -1060,7 +1060,7 @@ out:
START_TEST(shader_runner) START_TEST(shader_runner)
{ {
#ifdef _WIN32 #ifdef VKD3D_CROSSTEST
run_shader_tests_d3d9(argc, argv); run_shader_tests_d3d9(argc, argv);
run_shader_tests_d3d11(argc, argv); run_shader_tests_d3d11(argc, argv);
#else #else

17
tests/vkd3d_api.c
View File

@ -16,6 +16,23 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
/* Hack for MinGW-w64 headers.
*
* We want to use WIDL C inline wrappers because some methods
* in D3D12 interfaces return aggregate objects. Unfortunately,
* WIDL C inline wrappers are broken when used with MinGW-w64
* headers because FORCEINLINE expands to extern inline
* which leads to the "multiple storage classes in declaration
* specifiers" compiler error.
*/
#ifdef __MINGW32__
# include <_mingw.h>
# ifdef __MINGW64_VERSION_MAJOR
# undef __forceinline
# define __forceinline __inline__ __attribute__((__always_inline__,__gnu_inline__))
# endif
#endif
#define VK_NO_PROTOTYPES #define VK_NO_PROTOTYPES
#define COBJMACROS #define COBJMACROS
#define INITGUID #define INITGUID