diff options
| author | Jesse Natalie <jenatali@microsoft.com> | 2020-11-24 11:54:07 -0800 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-12-16 16:25:54 +0000 |
| commit | bc5f69faee969cf32fdb7cd31b8b12206d82a77e (patch) | |
| tree | 18405559287388094be0e64df2e1db08f4c41c05 /src/gallium/winsys/d3d12 | |
| parent | c37d8ae82b9d6ad30ebffbc8bf043afa0f5b6cc5 (diff) | |
d3d12: Use DirectX-Headers wrap for d3d12.h
This does 2 things for us:
1. Allows us to compile-time depend on any features from new headers,
instead of having to conditionally compile based on Windows SDK version.
2. Allows us to reference d3d12.h when compiling for non-Windows.
Reviewed-by: Bill Kristiansen <billkris@microsoft.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7937>
Diffstat (limited to 'src/gallium/winsys/d3d12')
| -rw-r--r-- | src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/d3d12/wgl/meson.build | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp b/src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp index 32723d9fe58..9ac8b80b2e6 100644 --- a/src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp +++ b/src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp @@ -25,7 +25,7 @@ #include <Windows.h> #include <dxgi1_4.h> -#include <d3d12.h> +#include <directx/d3d12.h> #include <wrl.h> #include "util/u_memory.h" diff --git a/src/gallium/winsys/d3d12/wgl/meson.build b/src/gallium/winsys/d3d12/wgl/meson.build index 8f05beeb885..0a25f9844a9 100644 --- a/src/gallium/winsys/d3d12/wgl/meson.build +++ b/src/gallium/winsys/d3d12/wgl/meson.build @@ -24,6 +24,7 @@ libd3d12winsys = static_library( 'd3d12winsys', files('d3d12_wgl_framebuffer.cpp', 'd3d12_wgl_winsys.c'), include_directories : [inc_src, inc_wgl, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_drivers], + dependencies : [dep_dxheaders], gnu_symbol_visibility : 'hidden', ) |