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/precompiled-module-2.cpp | 93 ++++++++++++---------------- 1 file changed, 38 insertions(+), 55 deletions(-) (limited to 'tools/gfx-unit-test/precompiled-module-2.cpp') diff --git a/tools/gfx-unit-test/precompiled-module-2.cpp b/tools/gfx-unit-test/precompiled-module-2.cpp index 87420aa6e..9d0f3071c 100644 --- a/tools/gfx-unit-test/precompiled-module-2.cpp +++ b/tools/gfx-unit-test/precompiled-module-2.cpp @@ -1,20 +1,24 @@ +#if 0 +// Duplicated: This test is identical to slang-rhi\tests\test-precompiled-module-cache.cpp +// TODO_TESTING port + #include "core/slang-basic.h" #include "core/slang-blob.h" #include "core/slang-io.h" #include "core/slang-memory-file-system.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 { // Test that mixing precompiled and non-precompiled modules is working. static Slang::Result precompileProgram( - gfx::IDevice* device, + rhi::IDevice* device, ISlangMutableFileSystem* fileSys, const char* shaderModuleName, PrecompilationMode precompilationMode) @@ -41,12 +45,12 @@ static Slang::Result precompileProgram( precompilationMode == PrecompilationMode::ExternalLink) { SlangCompileTarget target; - switch (device->getDeviceInfo().deviceType) + switch (device->getInfo().deviceType) { - case gfx::DeviceType::DirectX12: + case rhi::DeviceType::D3D12: target = SLANG_DXIL; break; - case gfx::DeviceType::Vulkan: + case rhi::DeviceType::Vulkan: target = SLANG_SPIRV; break; default: @@ -71,7 +75,7 @@ static Slang::Result precompileProgram( } } - // Write loaded modules to memory file system. + // Write loaded modules to file system. for (SlangInt i = 0; i < slangSession->getLoadedModuleCount(); i++) { auto module = slangSession->getLoadedModule(i); @@ -92,12 +96,6 @@ void precompiledModule2TestImplCommon( UnitTestContext* context, PrecompilationMode precompilationMode) { - Slang::ComPtr transientHeap; - ITransientResourceHeap::Desc transientHeapDesc = {}; - transientHeapDesc.constantBufferSize = 4096; - GFX_CHECK_CALL_ABORT( - device->createTransientResourceHeap(transientHeapDesc, transientHeap.writeRef())); - // First, load and compile the slang source. ComPtr memoryFileSystem = ComPtr(new Slang::MemoryFileSystem()); @@ -116,13 +114,13 @@ void precompiledModule2TestImplCommon( slang::SessionDesc sessionDesc = {}; sessionDesc.targetCount = 1; slang::TargetDesc targetDesc = {}; - switch (device->getDeviceInfo().deviceType) + switch (device->getInfo().deviceType) { - case gfx::DeviceType::DirectX12: + case rhi::DeviceType::D3D12: targetDesc.format = SLANG_DXIL; targetDesc.profile = device->getSlangSession()->getGlobalSession()->findProfile("sm_6_6"); break; - case gfx::DeviceType::Vulkan: + case rhi::DeviceType::Vulkan: targetDesc.format = SLANG_SPIRV; targetDesc.profile = device->getSlangSession()->getGlobalSession()->findProfile("GLSL_460"); break; @@ -169,61 +167,44 @@ void precompiledModule2TestImplCommon( slangReflection, precompilationMode)); - ComputePipelineStateDesc pipelineDesc = {}; + ComputePipelineDesc pipelineDesc = {}; pipelineDesc.program = shaderProgram.get(); - ComPtr pipelineState; - GFX_CHECK_CALL_ABORT( - device->createComputePipelineState(pipelineDesc, pipelineState.writeRef())); - + ComPtr pipeline = device->createComputePipeline(pipelineDesc); const int numberCount = 4; float initialData[] = {0.0f, 0.0f, 0.0f, 0.0f}; - IBufferResource::Desc bufferDesc = {}; - bufferDesc.sizeInBytes = numberCount * sizeof(float); - bufferDesc.format = gfx::Format::Unknown; + BufferDesc bufferDesc = {}; + bufferDesc.size = numberCount * sizeof(float); + bufferDesc.format = rhi::Format::Undefined; bufferDesc.elementSize = sizeof(float); - bufferDesc.allowedStates = ResourceStateSet( - ResourceState::ShaderResource, - ResourceState::UnorderedAccess, - ResourceState::CopyDestination, - ResourceState::CopySource); bufferDesc.defaultState = ResourceState::UnorderedAccess; bufferDesc.memoryType = MemoryType::DeviceLocal; - 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; + ComPtr numbersBuffer; GFX_CHECK_CALL_ABORT( - device->createBufferView(numbersBuffer, nullptr, viewDesc, bufferView.writeRef())); + device->createBuffer(bufferDesc, (void*)initialData, numbersBuffer.writeRef())); // We have done all the set up work, now it is time to start recording a command buffer for // GPU execution. { - ICommandQueue::Desc queueDesc = {ICommandQueue::QueueType::Graphics}; - auto queue = device->createCommandQueue(queueDesc); + auto queue = device->getQueue(QueueType::Graphics); - auto commandBuffer = transientHeap->createCommandBuffer(); - auto encoder = commandBuffer->encodeComputeCommands(); + auto commandBuffer = queue->createCommandEncoder(); + auto encoder = commandBuffer->beginComputePass(); - auto rootObject = encoder->bindPipeline(pipelineState); + auto rootObject = encoder->bindPipeline(pipeline); ShaderCursor entryPointCursor( rootObject->getEntryPoint(0)); // get a cursor the the first entry-point. // Bind buffer view to the entry point. - entryPointCursor.getPath("buffer").setResource(bufferView); + entryPointCursor.getPath("buffer").setBinding(numbersBuffer); encoder->dispatchCompute(1, 1, 1); - encoder->endEncoding(); - commandBuffer->close(); - queue->executeCommandBuffer(commandBuffer); + encoder->end(); + queue->submit(commandBuffer->finish()); queue->waitOnHost(); } - compareComputeResult(device, numbersBuffer, Slang::makeArray(3.0f, 3.0f, 3.0f, 3.0f)); + compareComputeResult(device, numbersBuffer, std::array{3.0f, 3.0f, 3.0f, 3.0f}); } void precompiledModule2TestImpl(IDevice* device, UnitTestContext* context) @@ -243,7 +224,7 @@ void precompiledTargetModule2ExternalLinkTestImpl(IDevice* device, UnitTestConte SLANG_UNIT_TEST(precompiledModule2D3D12) { - runTestImpl(precompiledModule2TestImpl, unitTestContext, Slang::RenderApiFlag::D3D12); + runTestImpl(precompiledModule2TestImpl, unitTestContext, DeviceType::D3D12); } SLANG_UNIT_TEST(precompiledTargetModuleInternalLink2D3D12) @@ -251,7 +232,7 @@ SLANG_UNIT_TEST(precompiledTargetModuleInternalLink2D3D12) runTestImpl( precompiledTargetModule2InternalLinkTestImpl, unitTestContext, - Slang::RenderApiFlag::D3D12); + DeviceType::D3D12); } /* @@ -259,13 +240,13 @@ SLANG_UNIT_TEST(precompiledTargetModuleInternalLink2D3D12) SLANG_UNIT_TEST(precompiledTargetModuleExternalLink2D3D12) { runTestImpl(precompiledTargetModule2ExternalLinkTestImpl, unitTestContext, -Slang::RenderApiFlag::D3D12); +DeviceType::D3D12); } */ SLANG_UNIT_TEST(precompiledModule2Vulkan) { - runTestImpl(precompiledModule2TestImpl, unitTestContext, Slang::RenderApiFlag::Vulkan); + runTestImpl(precompiledModule2TestImpl, unitTestContext, DeviceType::Vulkan); } SLANG_UNIT_TEST(precompiledTargetModule2InternalLinkVulkan) @@ -273,7 +254,7 @@ SLANG_UNIT_TEST(precompiledTargetModule2InternalLinkVulkan) runTestImpl( precompiledTargetModule2InternalLinkTestImpl, unitTestContext, - Slang::RenderApiFlag::Vulkan); + DeviceType::Vulkan); } SLANG_UNIT_TEST(precompiledTargetModule2ExternalLinkVulkan) @@ -281,7 +262,9 @@ SLANG_UNIT_TEST(precompiledTargetModule2ExternalLinkVulkan) runTestImpl( precompiledTargetModule2ExternalLinkTestImpl, unitTestContext, - Slang::RenderApiFlag::Vulkan); + DeviceType::Vulkan); } } // namespace gfx_test + +#endif -- cgit v1.2.3