1 files changed, 47 insertions, 65 deletions

diff --git a/tools/gfx-unit-test/mutable-shader-object.cpp b/tools/gfx-unit-test/mutable-shader-object.cpp
index c7ce40d34..c84fdd42a 100644
--- a/tools/gfx-unit-test/mutable-shader-object.cpp
+++ b/tools/gfx-unit-test/mutable-shader-object.cpp
@@ -1,21 +1,16 @@
 #include "core/slang-basic.h"
 #include "gfx-test-util.h"
-#include "gfx-util/shader-cursor.h"
-#include "slang-gfx.h"
 #include "unit-test/slang-unit-test.h"
 
-using namespace gfx;
+#include <slang-rhi.h>
+#include <slang-rhi/shader-cursor.h>
+
+using namespace rhi;
 
 namespace gfx_test
 {
 void mutableShaderObjectTestImpl(IDevice* device, UnitTestContext* context)
 {
-    Slang::ComPtr<ITransientResourceHeap> transientHeap;
-    ITransientResourceHeap::Desc transientHeapDesc = {};
-    transientHeapDesc.constantBufferSize = 4096;
-    GFX_CHECK_CALL_ABORT(
-        device->createTransientResourceHeap(transientHeapDesc, transientHeap.writeRef()));
-
     ComPtr<IShaderProgram> shaderProgram;
     slang::ProgramLayout* slangReflection;
     GFX_CHECK_CALL_ABORT(loadComputeProgram(
@@ -25,98 +20,85 @@ void mutableShaderObjectTestImpl(IDevice* device, UnitTestContext* context)
         "computeMain",
         slangReflection));
 
-    ComputePipelineStateDesc pipelineDesc = {};
+    ComputePipelineDesc pipelineDesc = {};
     pipelineDesc.program = shaderProgram.get();
-    ComPtr<gfx::IPipelineState> pipelineState;
-    GFX_CHECK_CALL_ABORT(
-        device->createComputePipelineState(pipelineDesc, pipelineState.writeRef()));
+    ComPtr<IComputePipeline> pipelineState;
+    GFX_CHECK_CALL_ABORT(device->createComputePipeline(pipelineDesc, pipelineState.writeRef()));
 
     float initialData[] = {0.0f, 1.0f, 2.0f, 3.0f};
     const int numberCount = SLANG_COUNT_OF(initialData);
-    IBufferResource::Desc bufferDesc = {};
-    bufferDesc.sizeInBytes = sizeof(initialData);
-    bufferDesc.format = gfx::Format::Unknown;
+    BufferDesc bufferDesc = {};
+    bufferDesc.size = sizeof(initialData);
+    bufferDesc.format = Format::Undefined;
     bufferDesc.elementSize = sizeof(float);
-    bufferDesc.allowedStates = ResourceStateSet(
-        ResourceState::ShaderResource,
-        ResourceState::UnorderedAccess,
-        ResourceState::CopyDestination,
-        ResourceState::CopySource);
+    bufferDesc.usage = BufferUsage::ShaderResource | BufferUsage::UnorderedAccess |
+                       BufferUsage::CopyDestination | BufferUsage::CopySource;
     bufferDesc.defaultState = ResourceState::UnorderedAccess;
     bufferDesc.memoryType = MemoryType::DeviceLocal;
 
-    ComPtr<IBufferResource> numbersBuffer;
+    ComPtr<IBuffer> numbersBuffer;
     GFX_CHECK_CALL_ABORT(
-        device->createBufferResource(bufferDesc, (void*)initialData, numbersBuffer.writeRef()));
-
-    ComPtr<IResourceView> bufferView;
-    IResourceView::Desc viewDesc = {};
-    viewDesc.type = IResourceView::Type::UnorderedAccess;
-    viewDesc.format = Format::Unknown;
-    GFX_CHECK_CALL_ABORT(
-        device->createBufferView(numbersBuffer, nullptr, viewDesc, bufferView.writeRef()));
+        device->createBuffer(bufferDesc, (void*)initialData, numbersBuffer.writeRef()));
 
     {
         slang::TypeReflection* addTransformerType =
             slangReflection->findTypeByName("AddTransformer");
 
         ComPtr<IShaderObject> transformer;
-        GFX_CHECK_CALL_ABORT(device->createMutableShaderObject(
+        GFX_CHECK_CALL_ABORT(device->createShaderObject(
             addTransformerType,
             ShaderObjectContainerType::None,
             transformer.writeRef()));
+
         // Set the `c` field of the `AddTransformer`.
         float c = 1.0f;
         ShaderCursor(transformer).getPath("c").setData(&c, sizeof(float));
 
-        ICommandQueue::Desc queueDesc = {ICommandQueue::QueueType::Graphics};
-        auto queue = device->createCommandQueue(queueDesc);
+        ComPtr<ICommandQueue> queue;
+        GFX_CHECK_CALL_ABORT(device->getQueue(QueueType::Graphics, queue.writeRef()));
 
-        auto commandBuffer = transientHeap->createCommandBuffer();
-        auto encoder = commandBuffer->encodeComputeCommands();
+        // Create root shader object
+        ComPtr<IShaderObject> rootObject;
+        GFX_CHECK_CALL_ABORT(device->createRootShaderObject(shaderProgram, rootObject.writeRef()));
 
-        auto rootObject = encoder->bindPipeline(pipelineState);
+        auto commandEncoder = queue->createCommandEncoder();
+        auto computeEncoder = commandEncoder->beginComputePass();
+
+        // Bind pipeline with our root object
+        computeEncoder->bindPipeline(pipelineState, rootObject);
 
         auto entryPointCursor = ShaderCursor(rootObject->getEntryPoint(0));
 
-        entryPointCursor.getPath("buffer").setResource(bufferView);
+        entryPointCursor.getPath("buffer").setBinding(Binding(numbersBuffer));
 
-        // Bind the previously created transformer object to root object.
-        ComPtr<IShaderObject> transformerVersion;
-        transformer->getCurrentVersion(transientHeap, transformerVersion.writeRef());
-        entryPointCursor.getPath("transformer").setObject(transformerVersion);
+        // Bind the transformer object to root object.
+        entryPointCursor.getPath("transformer").setObject(transformer);
 
-        encoder->dispatchCompute(1, 1, 1);
-        encoder->endEncoding();
+        computeEncoder->dispatchCompute(1, 1, 1);
+        computeEncoder->end();
 
-        auto barrierEncoder = commandBuffer->encodeResourceCommands();
-        barrierEncoder->bufferBarrier(
-            1,
-            numbersBuffer.readRef(),
-            ResourceState::UnorderedAccess,
-            ResourceState::UnorderedAccess);
-        barrierEncoder->endEncoding();
+        // Set buffer state to ensure writes are visible
+        commandEncoder->setBufferState(numbersBuffer, ResourceState::UnorderedAccess);
 
-        encoder = commandBuffer->encodeComputeCommands();
+        computeEncoder = commandEncoder->beginComputePass();
 
-        rootObject = encoder->bindPipeline(pipelineState);
-        entryPointCursor = ShaderCursor(rootObject->getEntryPoint(0));
+        // Bind pipeline with our root object again
+        computeEncoder->bindPipeline(pipelineState, rootObject);
 
         // Mutate `transformer` object and run again.
         c = 2.0f;
         ShaderCursor(transformer).getPath("c").setData(&c, sizeof(float));
-        transformer->getCurrentVersion(transientHeap, transformerVersion.writeRef());
-        entryPointCursor.getPath("buffer").setResource(bufferView);
-        entryPointCursor.getPath("transformer").setObject(transformerVersion);
-        encoder->dispatchCompute(1, 1, 1);
-        encoder->endEncoding();
-
-        commandBuffer->close();
-        queue->executeCommandBuffer(commandBuffer);
+        entryPointCursor.getPath("buffer").setBinding(Binding(numbersBuffer));
+        entryPointCursor.getPath("transformer").setObject(transformer);
+        computeEncoder->dispatchCompute(1, 1, 1);
+        computeEncoder->end();
+
+        auto commandBuffer = commandEncoder->finish();
+        queue->submit(commandBuffer);
         queue->waitOnHost();
     }
 
-    compareComputeResult(device, numbersBuffer, Slang::makeArray<float>(3.0f, 4.0f, 5.0f, 6.0f));
+    compareComputeResult(device, numbersBuffer, std::array{3.0f, 4.0f, 5.0f, 6.0f});
 }
 
 // SLANG_UNIT_TEST(mutableShaderObjectCPU)
@@ -126,16 +108,16 @@ void mutableShaderObjectTestImpl(IDevice* device, UnitTestContext* context)
 
 SLANG_UNIT_TEST(mutableShaderObjectD3D11)
 {
-    runTestImpl(mutableShaderObjectTestImpl, unitTestContext, Slang::RenderApiFlag::D3D11);
+    runTestImpl(mutableShaderObjectTestImpl, unitTestContext, DeviceType::D3D11);
 }
 
 SLANG_UNIT_TEST(mutableShaderObjectD3D12)
 {
-    runTestImpl(mutableShaderObjectTestImpl, unitTestContext, Slang::RenderApiFlag::D3D12);
+    runTestImpl(mutableShaderObjectTestImpl, unitTestContext, DeviceType::D3D12);
 }
 
 SLANG_UNIT_TEST(mutableShaderObjectVulkan)
 {
-    runTestImpl(mutableShaderObjectTestImpl, unitTestContext, Slang::RenderApiFlag::Vulkan);
+    runTestImpl(mutableShaderObjectTestImpl, unitTestContext, DeviceType::Vulkan);
 }
 } // namespace gfx_test