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>
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
#include <stdexcept>
|
||||
#include <vector>
|
||||
|
||||
#include <d3d12.h>
|
||||
#include <directx/d3d12.h>
|
||||
#include <dxgi1_4.h>
|
||||
#include <gtest/gtest.h>
|
||||
#include <wrl.h>
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#include <stdint.h>
|
||||
#include <stdexcept>
|
||||
|
||||
#include <d3d12.h>
|
||||
#include <directx/d3d12.h>
|
||||
#include <dxgi1_4.h>
|
||||
#include <gtest/gtest.h>
|
||||
#include <wrl.h>
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#include <stdint.h>
|
||||
#include <stdexcept>
|
||||
|
||||
#include <d3d12.h>
|
||||
#include <directx/d3d12.h>
|
||||
#include <dxgi1_4.h>
|
||||
#include <gtest/gtest.h>
|
||||
#include <wrl.h>
|
||||
|
||||
@@ -59,10 +59,12 @@ libclc_compiler = shared_library(
|
||||
dep_llvmspirvlib, idep_mesautil, idep_libdxil_compiler, idep_nir, dep_spirv_tools]
|
||||
)
|
||||
|
||||
clc_compiler_test = executable('clc_compiler_test',
|
||||
['clc_compiler_test.cpp', 'compute_test.cpp'],
|
||||
link_with : [libclc_compiler],
|
||||
dependencies : [idep_gtest, idep_mesautil],
|
||||
include_directories : [inc_include, inc_src])
|
||||
if dep_dxheaders.found()
|
||||
clc_compiler_test = executable('clc_compiler_test',
|
||||
['clc_compiler_test.cpp', 'compute_test.cpp'],
|
||||
link_with : [libclc_compiler],
|
||||
dependencies : [idep_gtest, idep_mesautil, idep_libdxil_compiler, dep_dxheaders],
|
||||
include_directories : [inc_include, inc_src])
|
||||
|
||||
test('clc_compiler_test', clc_compiler_test, timeout: 180)
|
||||
test('clc_compiler_test', clc_compiler_test, timeout: 180)
|
||||
endif
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
#include <vector>
|
||||
#include <assert.h>
|
||||
#include <d3d12.h>
|
||||
#include <directx/d3d12.h>
|
||||
|
||||
#include "util/list.h"
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ libd3d12_resource_state = static_library(
|
||||
files_libd3d12_resource_state,
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
include_directories : [inc_include, inc_src, inc_mesa],
|
||||
dependencies: [],
|
||||
dependencies: [dep_dxheaders],
|
||||
)
|
||||
|
||||
idep_libd3d12_resource_state = declare_dependency(
|
||||
|
||||
Reference in New Issue
Block a user