[PATCH 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>

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

[PATCH 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..6f3b2c873 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 \"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

[Martin Storsjö]

Right - this fails in vkd3d as there's no d3d12sdklayers.{idl,h} there. What do you think, @hverbeet, should we add such a file, or just skip this change here and add it directly in wine.git instead (slightly increasing the diff between wine and vkd3d's versions of the header, increasing the risk of clobbering it accidentally when syncing future changes)?

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

[Henri Verbeet (＠hverbeet)]

> Right - this fails in vkd3d as there's no d3d12sdklayers.{idl,h} there.

There is, but it's called vkd3d_d3d12sdklayers.idl. I'm not quite sure why this #include wasn't added back when it was introduced by commit 332b250e82a16bd1f5d6eec7659a834604452ec2. I suspect it was just an oversight, but it's also possible that the SDK headers simply changed in this regard.

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