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/root-shader-parameter.cpp | 111 ++++++++++---------------- 1 file changed, 43 insertions(+), 68 deletions(-) (limited to 'tools/gfx-unit-test/root-shader-parameter.cpp') diff --git a/tools/gfx-unit-test/root-shader-parameter.cpp b/tools/gfx-unit-test/root-shader-parameter.cpp index a06a07ef5..8098a33d5 100644 --- a/tools/gfx-unit-test/root-shader-parameter.cpp +++ b/tools/gfx-unit-test/root-shader-parameter.cpp @@ -1,41 +1,38 @@ +// Duplicated: This test is identical slang-rhi\tests\test-root-shader-parameter.cpp + #include "core/slang-basic.h" #include "gfx-test-util.h" -#include "gfx-util/shader-cursor.h" -#include "slang-gfx.h" +#include "slang-rhi.h" +#include "slang-rhi/shader-cursor.h" #include "unit-test/slang-unit-test.h" -using namespace gfx; +using namespace rhi; namespace gfx_test { -static ComPtr createBuffer(IDevice* device, uint32_t content) +static ComPtr createBuffer(IDevice* device, uint32_t content) { - ComPtr buffer; - IBufferResource::Desc bufferDesc = {}; - bufferDesc.sizeInBytes = sizeof(uint32_t); - bufferDesc.format = gfx::Format::Unknown; + ComPtr buffer; + BufferDesc bufferDesc = {}; + bufferDesc.size = sizeof(uint32_t); + bufferDesc.format = rhi::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; - GFX_CHECK_CALL_ABORT( - device->createBufferResource(bufferDesc, (void*)&content, buffer.writeRef())); + ComPtr numbersBuffer; + GFX_CHECK_CALL_ABORT(device->createBuffer(bufferDesc, (void*)&content, buffer.writeRef())); return buffer; } void rootShaderParameterTestImpl(IDevice* device, UnitTestContext* context) { - Slang::ComPtr transientHeap; - ITransientResourceHeap::Desc transientHeapDesc = {}; - transientHeapDesc.constantBufferSize = 4096; - GFX_CHECK_CALL_ABORT( - device->createTransientResourceHeap(transientHeapDesc, transientHeap.writeRef())); + if (!device->hasFeature(Feature::ParameterBlock)) + { + SLANG_CHECK("no support for parameter blocks"); + } ComPtr shaderProgram; slang::ProgramLayout* slangReflection; @@ -46,106 +43,84 @@ void rootShaderParameterTestImpl(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 pipeline = device->createComputePipeline(pipelineDesc); - Slang::List> buffers; - Slang::List> srvs, uavs; + Slang::List> buffers; for (uint32_t i = 0; i < 9; i++) { buffers.add(createBuffer(device, i == 0 ? 10 : i)); - - ComPtr bufferView; - IResourceView::Desc viewDesc = {}; - viewDesc.type = IResourceView::Type::UnorderedAccess; - viewDesc.format = Format::Unknown; - GFX_CHECK_CALL_ABORT( - device->createBufferView(buffers[i], nullptr, viewDesc, bufferView.writeRef())); - uavs.add(bufferView); - - viewDesc.type = IResourceView::Type::ShaderResource; - viewDesc.format = Format::Unknown; - GFX_CHECK_CALL_ABORT( - device->createBufferView(buffers[i], nullptr, viewDesc, bufferView.writeRef())); - srvs.add(bufferView); } ComPtr rootObject; - device->createMutableRootShaderObject(shaderProgram, rootObject.writeRef()); + device->createRootShaderObject(shaderProgram, rootObject.writeRef()); ComPtr g, s1, s2; - device->createMutableShaderObject( + device->createShaderObject( slangReflection->findTypeByName("S0"), ShaderObjectContainerType::None, g.writeRef()); - device->createMutableShaderObject( + device->createShaderObject( slangReflection->findTypeByName("S1"), ShaderObjectContainerType::None, s1.writeRef()); - device->createMutableShaderObject( + device->createShaderObject( slangReflection->findTypeByName("S1"), ShaderObjectContainerType::None, s2.writeRef()); { auto cursor = ShaderCursor(s1); - cursor["c0"].setResource(srvs[2]); - cursor["c1"].setResource(uavs[3]); - cursor["c2"].setResource(srvs[4]); + cursor["c0"].setBinding(buffers[2]); + cursor["c1"].setBinding(buffers[3]); + cursor["c2"].setBinding(buffers[4]); } { auto cursor = ShaderCursor(s2); - cursor["c0"].setResource(srvs[5]); - cursor["c1"].setResource(uavs[6]); - cursor["c2"].setResource(srvs[7]); + cursor["c0"].setBinding(buffers[5]); + cursor["c1"].setBinding(buffers[6]); + cursor["c2"].setBinding(buffers[7]); } { auto cursor = ShaderCursor(g); - cursor["b0"].setResource(srvs[0]); - cursor["b1"].setResource(srvs[1]); + cursor["b0"].setBinding(buffers[0]); + cursor["b1"].setBinding(buffers[1]); cursor["s1"].setObject(s1); cursor["s2"].setObject(s2); } { auto cursor = ShaderCursor(rootObject); cursor["g"].setObject(g); - cursor["buffer"].setResource(uavs[8]); + cursor["buffer"].setBinding(buffers[8]); } { - ICommandQueue::Desc queueDesc = {ICommandQueue::QueueType::Graphics}; - auto queue = device->createCommandQueue(queueDesc); + auto queue = device->getQueue(QueueType::Graphics); - auto commandBuffer = transientHeap->createCommandBuffer(); + auto commandBuffer = queue->createCommandEncoder(); { - auto encoder = commandBuffer->encodeComputeCommands(); - encoder->bindPipelineWithRootObject(pipelineState, rootObject); + auto encoder = commandBuffer->beginComputePass(); + encoder->bindPipeline(pipeline, rootObject); encoder->dispatchCompute(1, 1, 1); - encoder->endEncoding(); + encoder->end(); } - commandBuffer->close(); - queue->executeCommandBuffer(commandBuffer); + queue->submit(commandBuffer->finish()); queue->waitOnHost(); } - compareComputeResult( - device, - buffers[8], - Slang::makeArray(10 - 1 + 2 - 3 + 4 + 5 - 6 + 7)); + compareComputeResult(device, buffers[8], std::array{10 - 1 + 2 - 3 + 4 + 5 - 6 + 7}); } SLANG_UNIT_TEST(rootShaderParameterD3D12) { - runTestImpl(rootShaderParameterTestImpl, unitTestContext, Slang::RenderApiFlag::D3D12); + runTestImpl(rootShaderParameterTestImpl, unitTestContext, DeviceType::D3D12); } SLANG_UNIT_TEST(rootShaderParameterVulkan) { - runTestImpl(rootShaderParameterTestImpl, unitTestContext, Slang::RenderApiFlag::Vulkan); + runTestImpl(rootShaderParameterTestImpl, unitTestContext, DeviceType::Vulkan); } } // namespace gfx_test -- cgit v1.2.3