Module: Mesa Branch: staging/22.2 Commit: dacab91f27ad98eb0cc73bb23525833a0e67b906 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dacab91f27ad98eb0cc73bb23525833a0e67b906
Author: Yonggang Luo <[email protected]> Date: Fri Aug 5 01:24:05 2022 +0800 d3d12: Fixes compile error with mingw/gcc-x64 when static linkage to runtime library Closes #6968 Signed-off-by: Yonggang Luo <[email protected]> Suggested-by: Jesse Natalie <[email protected]> Reviewed-by: Jesse Natalie <[email protected]> Tested-by: Prodea Alexandru-Liviu <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17889> (cherry picked from commit b6fb2da6f27fb364379786f6f784af52661bdce9) --- .pick_status.json | 2 +- src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 18bc2012244..84ff627f4a8 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1561,7 +1561,7 @@ "description": "d3d12: Fixes compile error with mingw/gcc-x64 when static linkage to runtime library", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp b/src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp index 76db189a823..7864da8bd10 100644 --- a/src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp +++ b/src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp @@ -29,6 +29,7 @@ #include <dxgi1_4.h> #include <directx/d3d12.h> #include <wrl.h> +#include <dxguids/dxguids.h> #include "util/u_memory.h" #include "util/u_inlines.h"
