[PATCH v2 0/1] MR373: include: Add an #include of d3d12sdklayers.h in vkd3d_d3d12.idl

[Martin Storsjö]

This matches what is done in the upstream headers; end users
including d3d12.h don't need to explicitly include d3d12sdklayers.h.

Signed-off-by: Martin Storsjö <martin(a)martin.st>

--
  v2: include: Add an #include of d3d12sdklayers.h in vkd3d_d3d12.idl
 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/373

[PATCH v2 1/1] include: Add an #include of d3d12sdklayers.h in vkd3d_d3d12.idl

[Martin Storsjö]

From: Martin Storsjö <martin(a)martin.st>

This matches what is done in the upstream headers; end users
including d3d12.h don't need to explicitly include d3d12sdklayers.h.

Signed-off-by: Martin Storsjö <martin(a)martin.st>
---
 include/vkd3d_d3d12.idl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl
index 71faf6118..9b1b494c8 100644
--- a/include/vkd3d_d3d12.idl
+++ b/include/vkd3d_d3d12.idl
@@ -5083,6 +5083,10 @@ interface ID3D12GraphicsCommandList7 : ID3D12GraphicsCommandList6
             const D3D12_BARRIER_GROUP *barrier_groups);
 };
 
+cpp_quote("#ifndef D3D12_IGNORE_SDK_LAYERS")
+cpp_quote("#include \"vkd3d_d3d12sdklayers.h\"")
+cpp_quote("#endif")
+
 typedef HRESULT (__stdcall *PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER)(
         const void *data, SIZE_T data_size, REFIID iid, void **deserializer);
 
-- 
GitLab

https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/373

[PATCH v2 0/1] MR373: include: Add an #include of d3d12sdklayers.h in vkd3d_d3d12.idl - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.
-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/373