From e272aec6a9ddb8b0af82f72c061f5393f2b2bdab Mon Sep 17 00:00:00 2001 From: Yong He Date: Sat, 19 Feb 2022 00:15:17 -0800 Subject: Optimize d3d12 mutable shader object implementation. (#2138) * Optimize d3d12 mutable shader object implementation. * Disable mismatched clear value warning message from d3d sdk. * Fix. * Fix. * gfx: Avoid redundant d3d12 QueryInterface call. Co-authored-by: Yong He --- tools/gfx/immediate-renderer-base.cpp | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'tools/gfx/immediate-renderer-base.cpp') diff --git a/tools/gfx/immediate-renderer-base.cpp b/tools/gfx/immediate-renderer-base.cpp index c5e5032e5..e18727bdf 100644 --- a/tools/gfx/immediate-renderer-base.cpp +++ b/tools/gfx/immediate-renderer-base.cpp @@ -38,10 +38,12 @@ public: bool m_hasWriteTimestamps = false; RefPtr m_renderer; RefPtr m_rootShaderObject; + TransientResourceHeapBase* m_transientHeap; - void init(ImmediateRendererBase* renderer) + void init(ImmediateRendererBase* renderer, TransientResourceHeapBase* transientHeap) { m_renderer = renderer; + m_transientHeap = transientHeap; } void reset() @@ -289,6 +291,17 @@ public: return SLANG_OK; } + virtual SLANG_NO_THROW Result SLANG_MCALL + bindPipelineWithRootObject(IPipelineState* state, IShaderObject* rootObject) override + { + m_writer->setPipelineState(state); + auto stateImpl = static_cast(state); + SLANG_RETURN_ON_FAIL(m_commandBuffer->m_renderer->createRootShaderObject( + stateImpl->m_program, m_commandBuffer->m_rootShaderObject.writeRef())); + m_commandBuffer->m_rootShaderObject->copyFrom(rootObject, m_commandBuffer->m_transientHeap); + return SLANG_OK; + } + virtual SLANG_NO_THROW void SLANG_MCALL setViewports(uint32_t count, const Viewport* viewports) override { @@ -435,6 +448,18 @@ public: return SLANG_OK; } + virtual SLANG_NO_THROW Result SLANG_MCALL + bindPipelineWithRootObject(IPipelineState* state, IShaderObject* rootObject) override + { + m_writer->setPipelineState(state); + auto stateImpl = static_cast(state); + SLANG_RETURN_ON_FAIL(m_commandBuffer->m_renderer->createRootShaderObject( + stateImpl->m_program, m_commandBuffer->m_rootShaderObject.writeRef())); + m_commandBuffer->m_rootShaderObject->copyFrom( + rootObject, m_commandBuffer->m_transientHeap); + return SLANG_OK; + } + virtual SLANG_NO_THROW void SLANG_MCALL dispatchCompute(int x, int y, int z) override { m_writer->bindRootShaderObject(m_commandBuffer->m_rootShaderObject); -- cgit v1.2.3