Mesa (main): d3d12: Turn d3d12_format.h to include d3d12_common.h

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: cb53094ac1587b7f9d1a875eb1ea2f132dd4723f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb53094ac1587b7f9d1a875eb1ea2f132dd4723f

Author: Yonggang Luo <luoyonggang at gmail.com>
Date:   Wed Jun  1 16:03:38 2022 +0800

d3d12: Turn d3d12_format.h to include d3d12_common.h

Signed-off-by: Yonggang Luo <luoyonggang at gmail.com>
Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Acked-by: Daniel Stone <daniels at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16084>

---

 src/gallium/drivers/d3d12/d3d12_format.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/d3d12/d3d12_format.h b/src/gallium/drivers/d3d12/d3d12_format.h
index 8d41d9271e3..c6f45633bd3 100644
--- a/src/gallium/drivers/d3d12/d3d12_format.h
+++ b/src/gallium/drivers/d3d12/d3d12_format.h
@@ -24,12 +24,9 @@
 #ifndef D3D12_FORMATS_H
 #define D3D12_FORMATS_H
 
+#include "d3d12_common.h"
+
 #include <directx/dxgiformat.h>
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <wsl/winadapter.h>
-#endif
 #include <directx/dxgicommon.h>
 
 #include "pipe/p_format.h"