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

include: Prefix public header file names with vkd3d.

Browse Source 
Prevents possible clashes when using vkd3d with external Win32 headers.

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2017-12-15 15:16:21 +01:00 committed by Alexandre Julliard
parent f8c20beede
commit abff3ca469
15 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile.am
View File

@ -3,22 +3,22 @@ AM_CFLAGS = @VKD3D_CFLAGS@
AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/dummy -I$(srcdir)/include/private
widl_headers = \
include/d3d12.h \
include/dxgi.h \
include/dxgi1_2.h \
include/dxgi1_3.h \
include/dxgi1_4.h \
include/dxgibase.h \
include/dxgiformat.h \
include/dxgitype.h
include/vkd3d_d3d12.h \
include/vkd3d_dxgi.h \
include/vkd3d_dxgi1_2.h \
include/vkd3d_dxgi1_3.h \
include/vkd3d_dxgi1_4.h \
include/vkd3d_dxgibase.h \
include/vkd3d_dxgiformat.h \
include/vkd3d_dxgitype.h
vkd3d_public_headers = \
include/d3d12.h \
include/dummy/rpc.h \
include/dummy/rpcndr.h \
include/dxgibase.h \
include/dxgiformat.h \
include/vkd3d.h \
include/vkd3d_d3d12.h \
include/vkd3d_dxgibase.h \
include/vkd3d_dxgiformat.h \
include/vkd3d_shader.h \
include/vkd3d_utils.h \
include/vkd3d_windows.h

2
demos/demo.h
View File

@ -36,7 +36,7 @@
#include <vkd3d_windows.h>
#define WIDL_C_INLINE_WRAPPERS
#define COBJMACROS
#include <d3d12.h>
#include <vkd3d_d3d12.h>
#include <inttypes.h>
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*x))

2
demos/demo_win32.h
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <dxgi1_4.h>
#include <vkd3d_dxgi1_4.h>
#include <stdbool.h>
#include <stdio.h>

16
include/.gitignore vendored
View File

@ -1,11 +1,11 @@
config.h
config.h.in
d3d12.h
dxgi.h
dxgi1_2.h
dxgi1_3.h
dxgi1_4.h
dxgibase.h
dxgiformat.h
dxgitype.h
stamp-h1
vkd3d_d3d12.h
vkd3d_dxgi.h
vkd3d_dxgi1_2.h
vkd3d_dxgi1_3.h
vkd3d_dxgi1_4.h
vkd3d_dxgibase.h
vkd3d_dxgiformat.h
vkd3d_dxgitype.h

2
include/vkd3d.h
View File

@ -21,7 +21,7 @@
#ifndef VKD3D_NO_WIN32_TYPES
# include "vkd3d_windows.h"
# include "d3d12.h"
# include "vkd3d_d3d12.h"
#endif /* VKD3D_NO_WIN32_TYPES */
#include <vulkan/vulkan.h>

4
include/d3d12.idl → include/vkd3d_d3d12.idl
View File

@ -18,9 +18,9 @@
import "vkd3d_windows.h";
import "dxgibase.idl";
import "vkd3d_dxgibase.idl";
#include "unknown.idl"
#include "vkd3d_unknown.idl"
const UINT D3D12_CS_TGSM_REGISTER_COUNT = 8192;
const UINT D3D12_MAX_ROOT_COST = 64;

4
include/dxgi.idl → include/vkd3d_dxgi.idl
View File

@ -17,9 +17,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
import "dxgitype.idl";
import "vkd3d_dxgitype.idl";
#include "unknown.idl"
#include "vkd3d_unknown.idl"
typedef enum DXGI_SWAP_EFFECT
{

2
include/dxgi1_2.idl → include/vkd3d_dxgi1_2.idl
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
import "dxgi.idl";
import "vkd3d_dxgi.idl";
typedef enum DXGI_SCALING
{

2
include/dxgi1_3.idl → include/vkd3d_dxgi1_3.idl
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
import "dxgi1_2.idl";
import "vkd3d_dxgi1_2.idl";
typedef struct DXGI_MATRIX_3X2_F DXGI_MATRIX_3X2_F;

2
include/dxgi1_4.idl → include/vkd3d_dxgi1_4.idl
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
import "dxgi1_3.idl";
import "vkd3d_dxgi1_3.idl";
[
local,

2
include/dxgibase.idl → include/vkd3d_dxgibase.idl
View File

@ -18,7 +18,7 @@
import "vkd3d_windows.h";
import "dxgiformat.idl";
import "vkd3d_dxgiformat.idl";
cpp_quote("#ifndef DXGI_ERROR_INVALID_CALL")
cpp_quote("#define DXGI_ERROR_INVALID_CALL _HRESULT_TYPEDEF_(0x887a0001)")

0
include/dxgiformat.idl → include/vkd3d_dxgiformat.idl
View File

2
include/dxgitype.idl → include/vkd3d_dxgitype.idl
View File

@ -18,7 +18,7 @@
*/
import "vkd3d_windows.h";
import "dxgibase.idl";
import "vkd3d_dxgibase.idl";
typedef enum DXGI_COLOR_SPACE_TYPE
{

0
include/unknown.idl → include/vkd3d_unknown.idl
View File

4
tests/d3d12.c
View File

@ -41,7 +41,7 @@ typedef int HRESULT;
#include "vkd3d_test.h"
#include "vkd3d_windows.h"
#define WIDL_C_INLINE_WRAPPERS
#include "d3d12.h"
#include "vkd3d_d3d12.h"
#include <inttypes.h>
#include <limits.h>
@ -49,7 +49,7 @@ typedef int HRESULT;
#include <time.h>
#ifdef _WIN32
# include "dxgi1_4.h"
# include "vkd3d_dxgi1_4.h"
#else
# include <pthread.h>
# include "vkd3d_utils.h"