Mesa (main): d3d12: Fixes compiling error by include `<unknwn.h>`

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Jun 3 17:14:15 UTC 2022


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

Author: Yonggang Luo <luoyonggang at gmail.com>
Date:   Sat Apr 30 03:11:04 2022 +0800

d3d12: Fixes compiling error by include `<unknwn.h>`

In mingw's `<unknwn.h>`, it's defeind __REQUIRED_RPCNDR_H_VERSION__ to 475,
so that gcc/mingw won't raise compiling error that because directx/d3d12.h
define __REQUIRED_RPCNDR_H_VERSION__ to 500, but the maximal supported __REQUIRED_RPCNDR_H_VERSION__ in mingw
are 475.

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

---

 src/gallium/drivers/d3d12/d3d12_common.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gallium/drivers/d3d12/d3d12_common.h b/src/gallium/drivers/d3d12/d3d12_common.h
index 12f6aee7c85..f01872d751a 100644
--- a/src/gallium/drivers/d3d12/d3d12_common.h
+++ b/src/gallium/drivers/d3d12/d3d12_common.h
@@ -28,6 +28,8 @@
 
 #ifndef _WIN32
 #include <wsl/winadapter.h>
+#else
+#include <unknwn.h>
 #endif
 
 #define D3D12_IGNORE_SDK_LAYERS



More information about the mesa-commit mailing list