[PATCH 0/1] MR3976: include: Update the d3d12 header from vkd3d.
This corresponds to vkd3d as of commit acd3ed97dc8e1ac192b2ec6fc19596831a6b61c6. The cpp_quoted #include directive is fixed up to match the file naming outside of vkd3d, renaming the reference to vkd3d_d3d12sdklayers.h back to d3d12sdklayers.h. This matches other renamings that are done at the start of the file for vkd3d renamed idl files as well. Signed-off-by: Martin Storsjö <martin(a)martin.st> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3976
From: Martin Storsjö <martin(a)martin.st> This corresponds to vkd3d as of commit acd3ed97dc8e1ac192b2ec6fc19596831a6b61c6. The cpp_quoted #include directive is fixed up to match the file naming outside of vkd3d, renaming the reference to vkd3d_d3d12sdklayers.h back to d3d12sdklayers.h. This matches other renamings that are done at the start of the file for vkd3d renamed idl files as well. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/d3d12.idl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 9744b9c9cb5..593a40a02a7 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -5082,6 +5082,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/wine/-/merge_requests/3976
participants (1)
-
Martin Storsjö