From 086ecf41fa21138899960bb9805bc8ced91690f0 Mon Sep 17 00:00:00 2001 From: Yong He Date: Mon, 5 Apr 2021 13:31:05 -0700 Subject: Transient root shader object. (#1782) --- tools/gfx/cuda/render-cuda.cpp | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'tools/gfx/cuda/render-cuda.cpp') diff --git a/tools/gfx/cuda/render-cuda.cpp b/tools/gfx/cuda/render-cuda.cpp index b29f7f7e4..dbee0c5f2 100644 --- a/tools/gfx/cuda/render-cuda.cpp +++ b/tools/gfx/cuda/render-cuda.cpp @@ -990,7 +990,9 @@ public: return nullptr; } public: - void init(CUDADevice* device) { SLANG_UNUSED(device); } + CUDADevice* m_device; + + void init(CUDADevice* device) { m_device = device; } virtual SLANG_NO_THROW void SLANG_MCALL encodeRenderCommands( IRenderPassLayout* renderPass, IFramebuffer* framebuffer, @@ -1022,25 +1024,29 @@ public: public: CommandWriter* m_writer; - + CommandBufferImpl* m_commandBuffer; + ComPtr m_rootObject; virtual SLANG_NO_THROW void SLANG_MCALL endEncoding() override {} void init(CommandBufferImpl* cmdBuffer) { m_writer = cmdBuffer; + m_commandBuffer = cmdBuffer; } - virtual SLANG_NO_THROW void SLANG_MCALL setPipelineState(IPipelineState* state) override + virtual SLANG_NO_THROW Result SLANG_MCALL + bindPipeline(IPipelineState* state, IShaderObject** outRootObject) override { m_writer->setPipelineState(state); - } - virtual SLANG_NO_THROW void SLANG_MCALL - bindRootShaderObject(IShaderObject* object) override - { - m_writer->bindRootShaderObject(PipelineType::Compute, object); + PipelineStateBase* pipelineImpl = static_cast(state); + SLANG_RETURN_ON_FAIL(m_commandBuffer->m_device->createRootShaderObject( + pipelineImpl->m_program, outRootObject)); + m_rootObject = *outRootObject; + return SLANG_OK; } virtual SLANG_NO_THROW void SLANG_MCALL dispatchCompute(int x, int y, int z) override { + m_writer->bindRootShaderObject(m_rootObject); m_writer->dispatchCompute(x, y, z); } }; @@ -1831,8 +1837,7 @@ public: return SLANG_OK; } - virtual SLANG_NO_THROW Result SLANG_MCALL - createRootShaderObject(IShaderProgram* program, IShaderObject** outObject) override + Result createRootShaderObject(IShaderProgram* program, IShaderObject** outObject) { auto cudaProgram = dynamic_cast(program); auto cudaLayout = cudaProgram->layout; -- cgit v1.2.3