6 files changed, 28 insertions, 38 deletions
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 6ca35b8b0..8b954154b 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -257,7 +257,9 @@ if(SLANG_ENABLE_TESTS)
         EXECUTABLE
         EXCLUDE_FROM_ALL
         LINK_WITH_PRIVATE core compiler-core slang
-        INCLUDE_FROM_PRIVATE unit-test
+        INCLUDE_FROM_PRIVATE
+            unit-test
+            $<$<BOOL:${SLANG_ENABLE_SLANG_RHI}>:slang-rhi>
         FOLDER test
     )
     slang_add_target(
@@ -280,6 +282,7 @@ if(SLANG_ENABLE_TESTS)
             stb
             ${CMAKE_DL_LIBS}
             Threads::Threads
+        INCLUDE_FROM_PRIVATE $<$<BOOL:${SLANG_ENABLE_SLANG_RHI}>:slang-rhi>
         REQUIRES
             # Shared libraries dlopened by slang-test
             slang-reflection-test
diff --git a/tools/render-test/png-serialize-util.cpp b/tools/render-test/png-serialize-util.cpp
index 15aaba00b..9dca81ea8 100644
--- a/tools/render-test/png-serialize-util.cpp
+++ b/tools/render-test/png-serialize-util.cpp
@@ -17,10 +17,11 @@ using namespace Slang;
     const char* filename,
     ISlangBlob* pixels,
     uint32_t width,
-    uint32_t height)
+    uint32_t height,
+    uint32_t rowPitch)
 {
     int stbResult =
-        stbi_write_png(filename, width, height, 4, pixels->getBufferPointer(), width * 4);
+        stbi_write_png(filename, width, height, 4, pixels->getBufferPointer(), rowPitch);
 
     return stbResult ? SLANG_OK : SLANG_FAIL;
 }
diff --git a/tools/render-test/png-serialize-util.h b/tools/render-test/png-serialize-util.h
index 4eb119b30..38e796c3c 100644
--- a/tools/render-test/png-serialize-util.h
+++ b/tools/render-test/png-serialize-util.h
@@ -12,7 +12,8 @@ struct PngSerializeUtil
         const char* filename,
         ISlangBlob* pixels,
         uint32_t width,
-        uint32_t height);
+        uint32_t height,
+        uint32_t rowPitch);
 };
 
 } // namespace renderer_test
diff --git a/tools/render-test/render-test-main.cpp b/tools/render-test/render-test-main.cpp
index 48ebbd332..71347e4f9 100644
--- a/tools/render-test/render-test-main.cpp
+++ b/tools/render-test/render-test-main.cpp
@@ -911,11 +911,13 @@ void RenderTestApp::_initializeAccelerationStructure()
 
 void RenderTestApp::setProjectionMatrix(IShaderObject* rootObject)
 {
-    auto info = m_device->getDeviceInfo();
+    float kIdentity[16] =
+        {1.f, 0.f, 0.f, 0.f, 0.f, 1.f, 0.f, 0.f, 0.f, 0.f, 1.f, 0.f, 0.f, 0.f, 0.f, 1.f};
+    auto info = m_device->getInfo();
     ShaderCursor(rootObject)
         .getField("Uniforms")
         .getDereferenced()
-        .setData(info.identityProjectionMatrix, sizeof(float) * 16);
+        .setData(kIdentity, sizeof(kIdentity));
 }
 
 void RenderTestApp::finalize()
@@ -972,14 +974,15 @@ Result RenderTestApp::writeBindingOutput(const String& fileName)
 
 Result RenderTestApp::writeScreen(const String& filename)
 {
-    size_t rowPitch, pixelSize;
+    rhi::SubresourceLayout layout;
     ComPtr<ISlangBlob> blob;
-    SLANG_RETURN_ON_FAIL(
-        m_device->readTexture(m_colorBuffer, blob.writeRef(), &rowPitch, &pixelSize));
-    auto bufferSize = blob->getBufferSize();
-    uint32_t width = static_cast<uint32_t>(rowPitch / pixelSize);
-    uint32_t height = static_cast<uint32_t>(bufferSize / rowPitch);
-    return PngSerializeUtil::write(filename.getBuffer(), blob, width, height);
+    SLANG_RETURN_ON_FAIL(m_device->readTexture(m_colorBuffer, 0, 0, blob.writeRef(), &layout));
+    return PngSerializeUtil::write(
+        filename.getBuffer(),
+        blob,
+        layout.size.width,
+        layout.size.height,
+        layout.rowPitch);
 }
 
 Result RenderTestApp::update()
@@ -1488,7 +1491,7 @@ static SlangResult _innerMain(
     // Print adapter info after device creation but before any other operations
     if (options.showAdapterInfo)
     {
-        auto info = device->getDeviceInfo();
+        auto info = device->getInfo();
         auto out = stdWriters->getOut();
         out.print("Using graphics adapter: %s\n", info.adapterName);
     }
diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp
index 7e2956c3f..742300d22 100644
--- a/tools/slang-test/slang-test-main.cpp
+++ b/tools/slang-test/slang-test-main.cpp
@@ -46,22 +46,13 @@
 #include <atomic>
 #include <thread>
 
-using namespace Slang;
-
 #if defined(_WIN32)
-// https://devblogs.microsoft.com/directx/gettingstarted-dx12agility/#2.-set-agility-sdk-parameters
-
-extern "C"
-{
-    __declspec(dllexport) extern const uint32_t D3D12SDKVersion = 711;
-}
-
-extern "C"
-{
-    __declspec(dllexport) extern const char* D3D12SDKPath = ".\\D3D12\\";
-}
+#include <slang-rhi/agility-sdk.h>
+SLANG_RHI_EXPORT_AGILITY_SDK
 #endif
 
+using namespace Slang;
+
 // Options for a particular test
 struct TestOptions
 {
diff --git a/tools/test-server/test-server-main.cpp b/tools/test-server/test-server-main.cpp
index 5161fa03a..a2f7f8153 100644
--- a/tools/test-server/test-server-main.cpp
+++ b/tools/test-server/test-server-main.cpp
@@ -19,17 +19,8 @@
 #include <string.h>
 
 #if defined(_WIN32)
-// https://devblogs.microsoft.com/directx/gettingstarted-dx12agility/#2.-set-agility-sdk-parameters
-
-extern "C"
-{
-    __declspec(dllexport) extern const uint32_t D3D12SDKVersion = 711;
-}
-
-extern "C"
-{
-    __declspec(dllexport) extern const char* D3D12SDKPath = ".\\D3D12\\";
-}
+#include <slang-rhi/agility-sdk.h>
+SLANG_RHI_EXPORT_AGILITY_SDK
 #endif
 
 namespace TestServer