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: Include vkd3d_common.h in vkd3d_test.h.

Browse Source
This commit is contained in:
Józef Kucia
2016-10-10 11:22:50 +02:00
parent eb05a388e1
commit 5f3d5a1263
4 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/private/vkd3d_common.h
View File

@@ -28,6 +28,14 @@
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) #define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
#ifdef __GNUC__
# define VKD3D_PRINTF_FUNC(fmt, args) __attribute__((format(printf, fmt, args)))
# define VKD3D_UNUSED __attribute__((unused))
#else
# define VKD3D_PRINTF_FUNC(fmt, args)
# define VKD3D_UNUSED
#endif /* __GNUC__ */
#ifndef _WIN32 #ifndef _WIN32
# if HAVE_SYNC_ADD_AND_FETCH # if HAVE_SYNC_ADD_AND_FETCH
static inline ULONG InterlockedIncrement(ULONG volatile *x) static inline ULONG InterlockedIncrement(ULONG volatile *x)

6
include/private/vkd3d_debug.h
View File

@@ -25,12 +25,6 @@
#include "vkd3d_common.h" #include "vkd3d_common.h"
#ifdef __GNUC__
# define VKD3D_PRINTF_FUNC(fmt, args) __attribute__((format(printf, fmt, args)))
#else
# define VKD3D_PRINTF_FUNC(fmt, args)
#endif /* __GNUC__ */
enum vkd3d_dbg_level enum vkd3d_dbg_level
{ {
VKD3D_DBG_LEVEL_NONE, VKD3D_DBG_LEVEL_NONE,

10
include/private/vkd3d_test.h
View File

@@ -29,20 +29,14 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "vkd3d_common.h"
static void vkd3d_test_main(void); static void vkd3d_test_main(void);
static const char *vkd3d_test_name; static const char *vkd3d_test_name;
#define START_TEST(name) static const char *vkd3d_test_name = #name; \ #define START_TEST(name) static const char *vkd3d_test_name = #name; \
static void vkd3d_test_main(void) static void vkd3d_test_main(void)
#ifdef __GNUC__
# define VKD3D_PRINTF_FUNC(fmt, args) __attribute__((format(printf, fmt, args)))
# define VKD3D_UNUSED __attribute__((unused))
#else
# define VKD3D_PRINTF_FUNC(fmt, args)
# define VKD3D_UNUSED
#endif /* __GNUC__ */
#define ok ok_(__LINE__) #define ok ok_(__LINE__)
#define todo todo_(__LINE__) #define todo todo_(__LINE__)
#define skip skip_(__LINE__) #define skip skip_(__LINE__)

2
tests/d3d12.c
View File

@@ -55,8 +55,6 @@ typedef int HRESULT;
# include "vkd3d_utils.h" # include "vkd3d_utils.h"
#endif #endif
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*x))
static size_t align(size_t addr, unsigned int alignment) static size_t align(size_t addr, unsigned int alignment)
{ {
return (addr + (alignment - 1)) & ~(alignment - 1); return (addr + (alignment - 1)) & ~(alignment - 1);