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> --- examples/gpu-printing/main.cpp | 84 +++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 50 deletions(-) (limited to 'examples/gpu-printing/main.cpp') diff --git a/examples/gpu-printing/main.cpp b/examples/gpu-printing/main.cpp index 27a77a82b..ccf7838a6 100644 --- a/examples/gpu-printing/main.cpp +++ b/examples/gpu-printing/main.cpp @@ -7,16 +7,17 @@ using Slang::ComPtr; #include "core/slang-basic.h" #include "examples/example-base/example-base.h" -#include "gfx-util/shader-cursor.h" #include "gpu-printing.h" #include "platform/window.h" -#include "slang-gfx.h" +#include "slang-rhi.h" -using namespace gfx; +#include + +using namespace rhi; static const ExampleResources resourceBase("gpu-printing"); -ComPtr createSlangSession(gfx::IDevice* device) +ComPtr createSlangSession(IDevice* device) { ComPtr slangSession = device->getSlangSession(); return slangSession; @@ -40,19 +41,19 @@ struct ExampleProgram : public TestBase int gWindowWidth = 640; int gWindowHeight = 480; - ComPtr gDevice; + ComPtr gDevice; ComPtr gSlangSession; ComPtr gSlangModule; - ComPtr gProgram; + ComPtr gProgram; - ComPtr gPipelineState; + ComPtr gPipelineState; Slang::Dictionary gHashedStrings; GPUPrinting gGPUPrinting; - ComPtr loadComputeProgram( + ComPtr loadComputeProgram( slang::IModule* slangModule, char const* entryPointName) { @@ -69,10 +70,10 @@ struct ExampleProgram : public TestBase gGPUPrinting.loadStrings(linkedProgram->getLayout()); - gfx::IShaderProgram::Desc programDesc = {}; + ShaderProgramDesc programDesc = {}; programDesc.slangGlobalScope = linkedProgram; - auto shaderProgram = gDevice->createProgram(programDesc); + auto shaderProgram = gDevice->createShaderProgram(programDesc); return shaderProgram; } @@ -80,10 +81,10 @@ struct ExampleProgram : public TestBase Result execute(int argc, char* argv[]) { parseOption(argc, argv); - IDevice::Desc deviceDesc; - Result res = gfxCreateDevice(&deviceDesc, gDevice.writeRef()); - if (SLANG_FAILED(res)) - return res; + DeviceDesc deviceDesc; + gDevice = getRHI()->createDevice(deviceDesc); + if (!gDevice) + return SLANG_FAIL; Slang::String path = resourceBase.resolveResource("kernels.slang"); @@ -96,9 +97,9 @@ struct ExampleProgram : public TestBase if (!gProgram) return SLANG_FAIL; - ComputePipelineStateDesc desc; + ComputePipelineDesc desc; desc.program = gProgram; - auto pipelineState = gDevice->createComputePipelineState(desc); + auto pipelineState = gDevice->createComputePipeline(desc); if (!pipelineState) return SLANG_FAIL; @@ -106,45 +107,28 @@ struct ExampleProgram : public TestBase size_t printBufferSize = 4 * 1024; // use a small-ish (4KB) buffer for print output - IBufferResource::Desc printBufferDesc = {}; - printBufferDesc.type = IResource::Type::Buffer; - printBufferDesc.sizeInBytes = printBufferSize; + BufferDesc printBufferDesc = {}; + printBufferDesc.size = printBufferSize; printBufferDesc.elementSize = sizeof(uint32_t); - printBufferDesc.defaultState = ResourceState::UnorderedAccess; - printBufferDesc.allowedStates = ResourceStateSet( - ResourceState::CopySource, - ResourceState::CopyDestination, - ResourceState::UnorderedAccess); + printBufferDesc.usage = + BufferUsage::UnorderedAccess | BufferUsage::CopySource | BufferUsage::CopyDestination; printBufferDesc.memoryType = MemoryType::DeviceLocal; - auto printBuffer = gDevice->createBufferResource(printBufferDesc); - - IResourceView::Desc printBufferViewDesc = {}; - printBufferViewDesc.type = IResourceView::Type::UnorderedAccess; - printBufferViewDesc.format = Format::Unknown; - auto printBufferView = gDevice->createBufferView(printBuffer, nullptr, printBufferViewDesc); - - ITransientResourceHeap::Desc transientResourceHeapDesc = {}; - transientResourceHeapDesc.constantBufferSize = 256; - auto transientHeap = gDevice->createTransientResourceHeap(transientResourceHeapDesc); - - ICommandQueue::Desc queueDesc = {ICommandQueue::QueueType::Graphics}; - auto queue = gDevice->createCommandQueue(queueDesc); - auto commandBuffer = transientHeap->createCommandBuffer(); - auto encoder = commandBuffer->encodeComputeCommands(); - auto rootShaderObject = encoder->bindPipeline(gPipelineState); + auto printBuffer = gDevice->createBuffer(printBufferDesc); + + auto queue = gDevice->getQueue(QueueType::Graphics); + auto commandEncoder = queue->createCommandEncoder(); + auto computeEncoder = commandEncoder->beginComputePass(); + auto rootShaderObject = computeEncoder->bindPipeline(gPipelineState); auto cursor = ShaderCursor(rootShaderObject); - cursor["gPrintBuffer"].setResource(printBufferView); - encoder->dispatchCompute(1, 1, 1); - encoder->bufferBarrier( - printBuffer, - ResourceState::UnorderedAccess, - ResourceState::CopySource); - encoder->endEncoding(); - commandBuffer->close(); - queue->executeCommandBuffer(commandBuffer); + cursor["gPrintBuffer"].setBinding(printBuffer); + + computeEncoder->dispatchCompute(1, 1, 1); + + computeEncoder->end(); + queue->submit(commandEncoder->finish()); ComPtr blob; - gDevice->readBufferResource(printBuffer, 0, printBufferSize, blob.writeRef()); + gDevice->readBuffer(printBuffer, 0, printBufferSize, blob.writeRef()); gGPUPrinting.processGPUPrintCommands(blob->getBufferPointer(), printBufferSize); -- cgit v1.2.3