[PATCH 5/5] include: Define and check _D3D11_CONSTANTS define.
Matteo Bruni
mbruni at codeweavers.com
Wed Mar 28 14:05:17 CDT 2018
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
There are still a number of constants missing from d3d11.idl. I don't
have patches for that though.
include/d3d11.idl | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/include/d3d11.idl b/include/d3d11.idl
index 8de20563651..b4cc3be5a73 100644
--- a/include/d3d11.idl
+++ b/include/d3d11.idl
@@ -32,6 +32,9 @@ interface ID3D11ClassLinkage;
interface ID3D11Resource;
interface ID3D11VideoProcessorInputView;
+cpp_quote("#ifndef _D3D11_CONSTANTS")
+cpp_quote("#define _D3D11_CONSTANTS")
+
const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT = 14;
const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_COMPONENTS = 4;
const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_COMPONENT_BIT_COUNT = 32;
@@ -255,9 +258,6 @@ const UINT D3D11_STANDARD_VECTOR_SIZE = 4;
const UINT D3D11_STANDARD_VERTEX_ELEMENT_COUNT = 32;
const UINT D3D11_STANDARD_VERTEX_TOTAL_COMPONENT_COUNT = 64;
-cpp_quote("#if !defined(D3D11_NO_HELPERS) && defined(__cplusplus)")
-cpp_quote("struct CD3D11_DEFAULT {};")
-cpp_quote("extern const DECLSPEC_SELECTANY CD3D11_DEFAULT D3D11_DEFAULT;")
cpp_quote("#endif")
cpp_quote("#ifndef _D3D11_1_CONSTANTS")
@@ -270,6 +270,11 @@ cpp_quote("#define _D3D11_2_CONSTANTS")
const UINT D3D11_2_TILED_RESOURCE_TILE_SIZE_IN_BYTES = 0x10000;
cpp_quote("#endif")
+cpp_quote("#if !defined(D3D11_NO_HELPERS) && defined(__cplusplus)")
+cpp_quote("struct CD3D11_DEFAULT {};")
+cpp_quote("extern const DECLSPEC_SELECTANY CD3D11_DEFAULT D3D11_DEFAULT;")
+cpp_quote("#endif")
+
typedef enum D3D11_BLEND
{
D3D11_BLEND_ZERO = 1,
--
2.13.6
More information about the wine-devel
mailing list