Rename DirectXWrapper to indicate version

Rename `DirectXWrapper` to `DirectX12Wrapper` and only enable it if
D3D12 is supported.

Update the CMakeLists.txt files to use `target` properties instead of
global project ones.

No functional change.

Signed-off-by: Ahmed Hesham <ahmed.hesham@arm.com>

Author: ahesham-arm

test_conformance/common/directx_wrapper/CMakeLists.txt

@@ -4,10 +4,13 @@ set(DIRECTX_WRAPPER_SOURCES
 
 add_library(directx_wrapper STATIC ${DIRECTX_WRAPPER_SOURCES})
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(directx_wrapper
+    INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 
-include_directories(${CLConform_INCLUDE_DIR})
+target_compile_definitions(directx_wrapper
+    PUBLIC
+        $<$<BOOL:${D3D12_IS_SUPPORTED}>:D3D12_IS_SUPPORTED>)
 
-if (WIN32)
-    target_link_libraries(directx_wrapper d3d12)
-endif ()
+target_link_libraries(directx_wrapper
+    dxgi
+    $<$<BOOL:${D3D12_IS_SUPPORTED}>:d3d12>)

test_conformance/common/directx_wrapper/directx_wrapper.cpp

@@ -14,9 +14,12 @@
 // limitations under the License.
 //
 
+#include <stdexcept>
+
 #include "directx_wrapper.hpp"
 
-DirectXWrapper::DirectXWrapper()
+#if D3D12_IS_SUPPORTED
+DirectX12Wrapper::DirectX12Wrapper()
 {
 
     HRESULT hr = D3D12CreateDevice(nullptr, D3D_FEATURE_LEVEL_12_0,
@@ -44,18 +47,18 @@ DirectXWrapper::DirectXWrapper()
     }
 }
 
-ID3D12Device* DirectXWrapper::getDXDevice() const { return dx_device.Get(); }
+ID3D12Device* DirectX12Wrapper::getDXDevice() const { return dx_device.Get(); }
 
-ID3D12CommandQueue* DirectXWrapper::getDXCommandQueue() const
+ID3D12CommandQueue* DirectX12Wrapper::getDXCommandQueue() const
 {
     return dx_command_queue.Get();
 }
-ID3D12CommandAllocator* DirectXWrapper::getDXCommandAllocator() const
+ID3D12CommandAllocator* DirectX12Wrapper::getDXCommandAllocator() const
 {
     return dx_command_allocator.Get();
 }
 
-DirectXFenceWrapper::DirectXFenceWrapper(ID3D12Device* dx_device)
+DirectX12FenceWrapper::DirectX12FenceWrapper(ID3D12Device* dx_device)
     : dx_device(dx_device)
 {
     if (!dx_device)
@@ -69,3 +72,4 @@ DirectXFenceWrapper::DirectXFenceWrapper(ID3D12Device* dx_device)
         throw std::runtime_error("Failed to create the DirectX fence");
     }
 }
+#endif

test_conformance/common/directx_wrapper/directx_wrapper.hpp

@@ -16,15 +16,17 @@
 
 #pragma once
 
+#if D3D12_IS_SUPPORTED
 #include <d3d12.h>
+#endif
 #include <wrl/client.h>
-#include <stdexcept>
 
 using namespace Microsoft::WRL;
 
-class DirectXWrapper {
+#if D3D12_IS_SUPPORTED
+class DirectX12Wrapper {
 public:
-    DirectXWrapper();
+    DirectX12Wrapper();
 
     [[nodiscard]] ID3D12Device* getDXDevice() const;
     [[nodiscard]] ID3D12CommandQueue* getDXCommandQueue() const;
@@ -36,12 +38,13 @@ class DirectXWrapper {
     ComPtr<ID3D12CommandAllocator> dx_command_allocator = nullptr;
 };
 
-class DirectXFenceWrapper {
+class DirectX12FenceWrapper {
 public:
-    DirectXFenceWrapper(ID3D12Device* dx_device);
+    DirectX12FenceWrapper(ID3D12Device* dx_device);
     [[nodiscard]] ID3D12Fence* get() const { return dx_fence.Get(); }
 
 private:
     ComPtr<ID3D12Fence> dx_fence = nullptr;
     ComPtr<ID3D12Device> dx_device = nullptr;
-};
+};
+#endif

test_conformance/extensions/cl_khr_external_semaphore_dx_fence/CMakeLists.txt

@@ -20,7 +20,6 @@ if (WIN32)
             PROPERTIES LANGUAGE CXX)
 
     include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-    include_directories("../../common/directx_wrapper")
     include(../../CMakeCommon.txt)
 endif (WIN32)
 

test_conformance/extensions/cl_khr_external_semaphore_dx_fence/semaphore_dx_fence_base.h

@@ -67,7 +67,7 @@ struct DXFenceTestBase
             "supported import types");
 
         // Import D3D12 fence into OpenCL
-        fence_wrapper = new DirectXFenceWrapper(dx_wrapper.getDXDevice());
+        fence_wrapper = new DirectX12FenceWrapper(dx_wrapper.getDXDevice());
         semaphore = createSemaphoreFromFence(fence_wrapper->get());
         test_assert_error(!!semaphore, "Could not create semaphore");
 
@@ -83,12 +83,12 @@ struct DXFenceTestBase
     cl_context context = nullptr;
     cl_command_queue queue = nullptr;
     cl_int num_elems = 0;
-    DirectXWrapper dx_wrapper;
+    DirectX12Wrapper dx_wrapper;
 
     cl_semaphore_payload_khr semaphore_payload = 1;
     cl_semaphore_khr semaphore = nullptr;
     HANDLE fence_handle = nullptr;
-    DirectXFenceWrapper *fence_wrapper = nullptr;
+    DirectX12FenceWrapper *fence_wrapper = nullptr;
 
     clCreateSemaphoreWithPropertiesKHR_fn clCreateSemaphoreWithPropertiesKHR =
         nullptr;

test_conformance/extensions/cl_khr_external_semaphore_dx_fence/test_external_semaphore_dx_fence.cpp

@@ -191,7 +191,7 @@ struct MultipleWaitSignal final : DXFenceTestBase
     int SetUp() override
     {
         DXFenceTestBase::SetUp();
-        fence_wrapper_2 = new DirectXFenceWrapper(dx_wrapper.getDXDevice());
+        fence_wrapper_2 = new DirectX12FenceWrapper(dx_wrapper.getDXDevice());
         semaphore_2 = createSemaphoreFromFence(fence_wrapper_2->get());
         test_assert_error(!!semaphore_2, "Could not create semaphore");
 
@@ -282,7 +282,7 @@ struct MultipleWaitSignal final : DXFenceTestBase
 protected:
     cl_semaphore_khr semaphore_2 = nullptr;
     HANDLE fence_handle_2 = nullptr;
-    DirectXFenceWrapper *fence_wrapper_2 = nullptr;
+    DirectX12FenceWrapper *fence_wrapper_2 = nullptr;
 };
 
 // Confirm that multiple waits in OpenCL followed by signals in DX12 and waits