mirror of
https://gitlab.winehq.org/wine/vkd3d.git
synced 2025-09-12 18:50:22 -07:00
include: Prefix public header file names with vkd3d.
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:
committed by
Alexandre Julliard
parent
f8c20beede
commit
abff3ca469
16
include/.gitignore
vendored
16
include/.gitignore
vendored
@@ -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
|
||||
|
@@ -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>
|
||||
|
@@ -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;
|
@@ -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
|
||||
{
|
@@ -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
|
||||
{
|
@@ -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;
|
||||
|
@@ -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,
|
@@ -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)")
|
@@ -18,7 +18,7 @@
|
||||
*/
|
||||
|
||||
import "vkd3d_windows.h";
|
||||
import "dxgibase.idl";
|
||||
import "vkd3d_dxgibase.idl";
|
||||
|
||||
typedef enum DXGI_COLOR_SPACE_TYPE
|
||||
{
|
Reference in New Issue
Block a user