1 files changed, 18 insertions, 16 deletions

diff --git a/tools/gfx-unit-test/get-cmd-queue-handle-test.cpp b/tools/gfx-unit-test/get-cmd-queue-handle-test.cpp
index 82561f4a2..57e50b74b 100644
--- a/tools/gfx-unit-test/get-cmd-queue-handle-test.cpp
+++ b/tools/gfx-unit-test/get-cmd-queue-handle-test.cpp
@@ -1,31 +1,32 @@
 #include "core/slang-basic.h"
 #include "gfx-test-util.h"
-#include "gfx-util/shader-cursor.h"
-#include "slang-gfx.h"
+#include "slang-rhi/shader-cursor.h"
 #include "unit-test/slang-unit-test.h"
 
+#include <slang-rhi.h>
+
 #if SLANG_WINDOWS_FAMILY
 #include <d3d12.h>
 #endif
 
-using namespace gfx;
+using namespace rhi;
 
 namespace gfx_test
 {
 void getQueueHandleTestImpl(IDevice* device, UnitTestContext* context)
 {
-    ICommandQueue::Desc queueDesc = {ICommandQueue::QueueType::Graphics};
-    auto queue = device->createCommandQueue(queueDesc);
-    InteropHandle handle;
+    ComPtr<ICommandQueue> queue;
+    GFX_CHECK_CALL_ABORT(device->getQueue(QueueType::Graphics, queue.writeRef()));
+    NativeHandle handle;
     GFX_CHECK_CALL_ABORT(queue->getNativeHandle(&handle));
-    if (device->getDeviceInfo().deviceType == gfx::DeviceType::Vulkan)
+    if (device->getInfo().deviceType == rhi::DeviceType::Vulkan)
     {
-        SLANG_CHECK(handle.handleValue != 0);
+        SLANG_CHECK(handle.value != 0);
     }
 #if SLANG_WINDOWS_FAMILY
     else
     {
-        auto d3d12Queue = (ID3D12CommandQueue*)handle.handleValue;
+        auto d3d12Queue = (ID3D12CommandQueue*)handle.value;
         Slang::ComPtr<IUnknown> testHandle1;
         GFX_CHECK_CALL_ABORT(d3d12Queue->QueryInterface<IUnknown>(testHandle1.writeRef()));
         Slang::ComPtr<ID3D12CommandQueue> testHandle2;
@@ -38,23 +39,24 @@ void getQueueHandleTestImpl(IDevice* device, UnitTestContext* context)
 
 void getQueueHandleTestAPI(UnitTestContext* context, Slang::RenderApiFlag::Enum api)
 {
-    gfxEnableDebugLayer(context->enableDebugLayers);
+    if (context->enableDebugLayers)
+        getRHI()->enableDebugLayers();
     if ((api & context->enabledApis) == 0)
     {
         SLANG_IGNORE_TEST;
     }
     Slang::ComPtr<IDevice> device;
-    IDevice::Desc deviceDesc = {};
+    DeviceDesc deviceDesc = {};
     switch (api)
     {
     case Slang::RenderApiFlag::D3D11:
-        deviceDesc.deviceType = gfx::DeviceType::DirectX11;
+        deviceDesc.deviceType = rhi::DeviceType::D3D11;
         break;
     case Slang::RenderApiFlag::D3D12:
-        deviceDesc.deviceType = gfx::DeviceType::DirectX12;
+        deviceDesc.deviceType = rhi::DeviceType::D3D12;
         break;
     case Slang::RenderApiFlag::Vulkan:
-        deviceDesc.deviceType = gfx::DeviceType::Vulkan;
+        deviceDesc.deviceType = rhi::DeviceType::Vulkan;
         break;
     default:
         SLANG_IGNORE_TEST;
@@ -63,14 +65,14 @@ void getQueueHandleTestAPI(UnitTestContext* context, Slang::RenderApiFlag::Enum
     const char* searchPaths[] = {"", "../../tools/gfx-unit-test", "tools/gfx-unit-test"};
     deviceDesc.slang.searchPathCount = (SlangInt)SLANG_COUNT_OF(searchPaths);
     deviceDesc.slang.searchPaths = searchPaths;
-    auto createDeviceResult = gfxCreateDevice(&deviceDesc, device.writeRef());
+    auto createDeviceResult = getRHI()->createDevice(deviceDesc, device.writeRef());
     if (SLANG_FAILED(createDeviceResult))
     {
         SLANG_IGNORE_TEST;
     }
     // Ignore this test on swiftshader. Swiftshader seems to have a bug that causes the test
     // to crash.
-    if (Slang::String(device->getDeviceInfo().adapterName).toLower().contains("swiftshader"))
+    if (Slang::String(device->getInfo().adapterName).toLower().contains("swiftshader"))
     {
         SLANG_IGNORE_TEST;
     }