From 43d0c2100ef1a5df4b54525e50eb29fe7c39ec16 Mon Sep 17 00:00:00 2001 From: Gangzheng Tong Date: Tue, 8 Jul 2025 23:44:56 -0700 Subject: Convert gfx unit tests and examples to use slang-rhi (#7577) * Port first gfx unit test to slang-rhi * port triangle example to use slang-rhi * port platform-test to slang-rhi * Update platform-test to throttle mouse move events * port gpu-printing example to use slang-rhi * port model-viewer example to use slang-rhi * port ray-tracing example to use slang-rhi * port ray-tracing pipeline example to use slang-rhi * port reflection parameter blocks example to use slang-rhi * port shader-object example to use slang-rhi * port shader-toy example to use slang-rhi * Port most of tests to slang-rhi * port link-time-constant-array-size to use slang-rhi * Fix tests and find matching tests in slang-rhi * port autodiff-texture * remove gfx target; port nv-aftermath-example * update include path for shader-cursor.h * Disabled 2 more ported tests * fix build error * remove gfx test * put slang-rhi (static-lib) before slang (shared) * format code (#7621) Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> * add debug callback * format code (#7649) Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> * Address review comments; revert back to use SLANG_CHECK_MSG --------- Co-authored-by: slangbot Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> --- tools/gfx-unit-test/mutable-shader-object.cpp | 112 +++++++++++--------------- 1 file changed, 47 insertions(+), 65 deletions(-) (limited to 'tools/gfx-unit-test/mutable-shader-object.cpp') 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 +#include + +using namespace rhi; namespace gfx_test { void mutableShaderObjectTestImpl(IDevice* device, UnitTestContext* context) { - Slang::ComPtr transientHeap; - ITransientResourceHeap::Desc transientHeapDesc = {}; - transientHeapDesc.constantBufferSize = 4096; - GFX_CHECK_CALL_ABORT( - device->createTransientResourceHeap(transientHeapDesc, transientHeap.writeRef())); - ComPtr 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 pipelineState; - GFX_CHECK_CALL_ABORT( - device->createComputePipelineState(pipelineDesc, pipelineState.writeRef())); + ComPtr 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 numbersBuffer; + ComPtr numbersBuffer; GFX_CHECK_CALL_ABORT( - device->createBufferResource(bufferDesc, (void*)initialData, numbersBuffer.writeRef())); - - ComPtr 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 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 queue; + GFX_CHECK_CALL_ABORT(device->getQueue(QueueType::Graphics, queue.writeRef())); - auto commandBuffer = transientHeap->createCommandBuffer(); - auto encoder = commandBuffer->encodeComputeCommands(); + // Create root shader object + ComPtr 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 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(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 -- cgit v1.2.3