1 files changed, 13 insertions, 14 deletions
diff --git a/tools/gfx-unit-test/link-time-type-layout-nested.cpp b/tools/gfx-unit-test/link-time-type-layout-nested.cpp
index b6ea0e64d..2c2c83a94 100644
--- a/tools/gfx-unit-test/link-time-type-layout-nested.cpp
+++ b/tools/gfx-unit-test/link-time-type-layout-nested.cpp
@@ -1,9 +1,9 @@
 #include "core/slang-blob.h"
 #include "gfx-test-util.h"
-#include "slang-gfx.h"
+#include "slang-rhi.h"
 #include "unit-test/slang-unit-test.h"
 
-using namespace gfx;
+using namespace rhi;
 
 namespace gfx_test
 {
@@ -17,8 +17,8 @@ static void diagnoseIfNeeded(Slang::ComPtr<slang::IBlob>& diagnosticsBlob)
 }
 
 static Slang::Result loadProgram(
-    gfx::IDevice* device,
-    Slang::ComPtr<gfx::IShaderProgram>& outShaderProgram,
+    rhi::IDevice* device,
+    Slang::ComPtr<rhi::IShaderProgram>& outShaderProgram,
     slang::ProgramLayout*& slangReflection)
 {
     // main.slang: declares the interface, extern struct Inner, and Outer struct with Inner field
@@ -102,9 +102,9 @@ static Slang::Result loadProgram(
     slangReflection = composedProgram->getLayout();
 
     // Create a shader program
-    gfx::IShaderProgram::Desc programDesc = {};
+    ShaderProgramDesc programDesc = {};
     programDesc.slangGlobalScope = composedProgram.get();
-    auto shaderProgram = device->createProgram(programDesc);
+    auto shaderProgram = device->createShaderProgram(programDesc);
     outShaderProgram = shaderProgram;
 
     return SLANG_OK;
@@ -200,9 +200,9 @@ static void validateNestedExternStructLayout(
     SLANG_CHECK_MSG(foundDataField, "Could not find field 'data' in Inner struct");
 }
 
-void linkTimeTypeLayoutNestedImpl(gfx::IDevice* device, UnitTestContext* context)
+void linkTimeTypeLayoutNestedImpl(rhi::IDevice* device, UnitTestContext* context)
 {
-    Slang::ComPtr<gfx::IShaderProgram> shaderProgram;
+    Slang::ComPtr<rhi::IShaderProgram> shaderProgram;
     slang::ProgramLayout* slangReflection = nullptr;
 
     auto result = loadProgram(device, shaderProgram, slangReflection);
@@ -212,13 +212,12 @@ void linkTimeTypeLayoutNestedImpl(gfx::IDevice* device, UnitTestContext* context
     validateNestedExternStructLayout(context, slangReflection);
 
     // Create a graphics pipeline to verify everything works
-    GraphicsPipelineStateDesc pipelineDesc = {};
+    RenderPipelineDesc pipelineDesc = {};
     pipelineDesc.program = shaderProgram.get();
-    pipelineDesc.primitiveType = PrimitiveType::Triangle;
+    pipelineDesc.primitiveTopology = PrimitiveTopology::TriangleList;
 
-    ComPtr<gfx::IPipelineState> pipelineState;
-    auto pipelineResult =
-        device->createGraphicsPipelineState(pipelineDesc, pipelineState.writeRef());
+    ComPtr<IRenderPipeline> pipelineState;
+    auto pipelineResult = device->createRenderPipeline(pipelineDesc, pipelineState.writeRef());
     SLANG_CHECK(SLANG_SUCCEEDED(pipelineResult));
 }
 
@@ -235,7 +234,7 @@ void linkTimeTypeLayoutNestedImpl(gfx::IDevice* device, UnitTestContext* context
 
 SLANG_UNIT_TEST(linkTimeTypeLayoutNested)
 {
-    runTestImpl(linkTimeTypeLayoutNestedImpl, unitTestContext, Slang::RenderApiFlag::Vulkan);
+    runTestImpl(linkTimeTypeLayoutNestedImpl, unitTestContext, DeviceType::Vulkan);
 }
 
 } // namespace gfx_test