diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | include/vkd3d_utils.h | 46 | ||||
| -rw-r--r-- | include/vkd3d_windows.h | 10 | ||||
| -rw-r--r-- | libs/vkd3d-utils/vkd3d_utils_private.h | 2 | ||||
| -rw-r--r-- | tests/d3d12.c | 4 |
5 files changed, 52 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index f5449d49..aefed4aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,6 +10,7 @@ vkd3d_public_headers = \ include/dummy/rpc.h \ include/dummy/rpcndr.h \ include/dxgibase.h \ + include/vkd3d_utils.h \ include/vkd3d_windows.h vkd3d_tests = \ diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h new file mode 100644 index 00000000..6b13d3d2 --- /dev/null +++ b/include/vkd3d_utils.h @@ -0,0 +1,46 @@ +/* + * Copyright 2016 Józef Kucia for CodeWeavers + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef __VKD3D_UTILS_H +#define __VKD3D_UTILS_H + +#include "vkd3d.h" + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#define WAIT_OBJECT_0 (0) +#define WAIT_TIMEOUT (1) +#define WAIT_FAILED (~0u) +#define INFINITE (~0u) + +HANDLE WINAPI VKD3DCreateEvent(void); +BOOL WINAPI VKD3DSignalEvent(HANDLE event); +unsigned int WINAPI VKD3DWaitEvent(HANDLE event, unsigned int milliseconds); +void WINAPI VKD3DDestroyEvent(HANDLE event); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __VKD3D_UTILS_H */ diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index 7376dcbe..855b3240 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -171,16 +171,6 @@ typedef struct SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES; # define IsEqualGUID(guid1, guid2) (!memcmp(guid1, guid2, sizeof(GUID))) #endif -#define WAIT_OBJECT_0 (0) -#define WAIT_TIMEOUT (1) -#define WAIT_FAILED (~0u) -#define INFINITE (~0u) - -HANDLE WINAPI VKD3DCreateEvent(void); -BOOL WINAPI VKD3DSignalEvent(HANDLE event); -unsigned int WINAPI VKD3DWaitEvent(HANDLE event, unsigned int milliseconds); -void WINAPI VKD3DDestroyEvent(HANDLE event); - #elif !defined(__WIDL__) # include <windows.h> diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h index f9f0db53..5fd90413 100644 --- a/libs/vkd3d-utils/vkd3d_utils_private.h +++ b/libs/vkd3d-utils/vkd3d_utils_private.h @@ -28,7 +28,7 @@ #define COBJMACROS #define NONAMELESSUNION #include "vkd3d_memory.h" -#include "vkd3d.h" +#include "vkd3d_utils.h" struct vkd3d_event { diff --git a/tests/d3d12.c b/tests/d3d12.c index e6011da5..2488b53a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -48,6 +48,10 @@ typedef int HRESULT; #define WIDL_C_INLINE_WRAPPERS #include "d3d12.h" +#ifndef _WIN32 +# include "vkd3d_utils.h" +#endif + #define ARRAY_SIZE(x) (sizeof(x) / sizeof(*x)) static size_t align(size_t addr, unsigned int alignment) |