Skip to content

Commit de3b8c0

Browse files
committed
Support D3D10 and D3D11 in the wrapper project
Add CMake support for D3D10 and D3D11 in the `directx_wrapper` project. Including the wrapper subdirectory is now enabled if any of D3D{10,11,12} are supported. No code changes, scaffolding only. Signed-off-by: Ahmed Hesham <ahmed.hesham@arm.com>
1 parent 2d2c5ac commit de3b8c0

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

test_conformance/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ if(VULKAN_IS_SUPPORTED)
5656
add_subdirectory( common/vulkan_wrapper )
5757
add_subdirectory( vulkan )
5858
endif()
59-
if(D3D12_IS_SUPPORTED)
59+
if(D3D10_IS_SUPPORTED OR D3D11_IS_SUPPORTED OR D3D12_IS_SUPPORTED)
6060
add_subdirectory(common/directx_wrapper)
6161
endif ()
6262

test_conformance/common/directx_wrapper/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@ target_include_directories(directx_wrapper
99

1010
target_compile_definitions(directx_wrapper
1111
PUBLIC
12+
$<$<BOOL:${D3D10_IS_SUPPORTED}>:D3D10_IS_SUPPORTED>
13+
$<$<BOOL:${D3D11_IS_SUPPORTED}>:D3D11_IS_SUPPORTED>
1214
$<$<BOOL:${D3D12_IS_SUPPORTED}>:D3D12_IS_SUPPORTED>)
1315

1416
target_link_libraries(directx_wrapper
1517
dxgi
18+
$<$<BOOL:${D3D10_IS_SUPPORTED}>:d3d10>
19+
$<$<BOOL:${D3D11_IS_SUPPORTED}>:d3d11>
1620
$<$<BOOL:${D3D12_IS_SUPPORTED}>:d3d12>)

0 commit comments

Comments
 (0)