From f65d756bff8d4c5cbc15bd0322a2ae8e6b896a21 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 29 Oct 2024 14:49:26 +0800 Subject: format * format * Minor test fixes * enable checking cpp format in ci --- tools/gfx/immediate-renderer-base.cpp | 187 ++++++++++++++++++++-------------- 1 file changed, 109 insertions(+), 78 deletions(-) (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 4043512c6..e993ce319 100644 --- a/tools/gfx/immediate-renderer-base.cpp +++ b/tools/gfx/immediate-renderer-base.cpp @@ -1,10 +1,11 @@ #include "immediate-renderer-base.h" -#include "simple-render-pass-layout.h" -#include "simple-transient-resource-heap.h" + +#include "command-encoder-com-forward.h" #include "command-writer.h" #include "core/slang-basic.h" #include "core/slang-blob.h" -#include "command-encoder-com-forward.h" +#include "simple-render-pass-layout.h" +#include "simple-transient-resource-heap.h" namespace gfx { @@ -44,10 +45,7 @@ public: m_transientHeap = transientHeap; } - void reset() - { - m_writer.clear(); - } + void reset() { m_writer.clear(); } class ResourceCommandEncoderImpl : public IResourceCommandEncoder { @@ -62,14 +60,15 @@ public: virtual void* getInterface(SlangUUID const& uuid) { - if (uuid == GfxGUID::IID_IResourceCommandEncoder || uuid == ISlangUnknown::getTypeGuid()) + if (uuid == GfxGUID::IID_IResourceCommandEncoder || + uuid == ISlangUnknown::getTypeGuid()) { return this; } return nullptr; } virtual SLANG_NO_THROW SlangResult SLANG_MCALL - queryInterface(SlangUUID const& uuid, void** outObject) override + queryInterface(SlangUUID const& uuid, void** outObject) override { if (auto ptr = getInterface(uuid)) { @@ -93,13 +92,13 @@ public: } virtual SLANG_NO_THROW void SLANG_MCALL - uploadBufferData(IBufferResource* dst, size_t offset, size_t size, void* data) override + uploadBufferData(IBufferResource* dst, size_t offset, size_t size, void* data) override { m_writer->uploadBufferData(dst, offset, size, data); } virtual SLANG_NO_THROW void SLANG_MCALL - writeTimestamp(IQueryPool* pool, GfxIndex index) override + writeTimestamp(IQueryPool* pool, GfxIndex index) override { m_writer->writeTimestamp(pool, index); } @@ -109,14 +108,16 @@ public: ITextureResource* const* textures, ResourceState src, ResourceState dst) override - {} + { + } virtual SLANG_NO_THROW void SLANG_MCALL bufferBarrier( GfxCount count, IBufferResource* const* buffers, ResourceState src, ResourceState dst) override - {} + { + } virtual SLANG_NO_THROW void SLANG_MCALL copyTexture( ITextureResource* dst, @@ -238,43 +239,44 @@ public: } virtual SLANG_NO_THROW void SLANG_MCALL - beginDebugEvent(const char* name, float rgbColor[3]) override + beginDebugEvent(const char* name, float rgbColor[3]) override { SLANG_UNUSED(name); SLANG_UNUSED(rgbColor); } - virtual SLANG_NO_THROW void SLANG_MCALL endDebugEvent() override - { - } + virtual SLANG_NO_THROW void SLANG_MCALL endDebugEvent() override {} }; ResourceCommandEncoderImpl m_resourceCommandEncoder; virtual SLANG_NO_THROW void SLANG_MCALL - encodeResourceCommands(IResourceCommandEncoder** outEncoder) override + encodeResourceCommands(IResourceCommandEncoder** outEncoder) override { m_resourceCommandEncoder.init(this); *outEncoder = &m_resourceCommandEncoder; } - class RenderCommandEncoderImpl - : public IRenderCommandEncoder - , public ResourceCommandEncoderImpl + class RenderCommandEncoderImpl : public IRenderCommandEncoder, public ResourceCommandEncoderImpl { public: SLANG_GFX_FORWARD_RESOURCE_COMMAND_ENCODER_IMPL(ResourceCommandEncoderImpl) virtual void* getInterface(SlangUUID const& uuid) override { - if (uuid == GfxGUID::IID_IResourceCommandEncoder || uuid == GfxGUID::IID_IRenderCommandEncoder || uuid == ISlangUnknown::getTypeGuid()) + if (uuid == GfxGUID::IID_IResourceCommandEncoder || + uuid == GfxGUID::IID_IRenderCommandEncoder || uuid == ISlangUnknown::getTypeGuid()) { return this; } return nullptr; } + public: virtual SLANG_NO_THROW void SLANG_MCALL endEncoding() override {} - void init(CommandBufferImpl* cmdBuffer, SimpleRenderPassLayout* renderPass, IFramebuffer* framebuffer) + void init( + CommandBufferImpl* cmdBuffer, + SimpleRenderPassLayout* renderPass, + IFramebuffer* framebuffer) { ResourceCommandEncoderImpl::init(cmdBuffer); @@ -310,38 +312,43 @@ public: } virtual SLANG_NO_THROW Result SLANG_MCALL - bindPipeline(IPipelineState* state, IShaderObject** outRootObject) override + bindPipeline(IPipelineState* state, IShaderObject** outRootObject) 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())); + stateImpl->m_program, + m_commandBuffer->m_rootShaderObject.writeRef())); *outRootObject = m_commandBuffer->m_rootShaderObject.Ptr(); return SLANG_OK; } virtual SLANG_NO_THROW Result SLANG_MCALL - bindPipelineWithRootObject(IPipelineState* state, IShaderObject* rootObject) override + 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); + 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(GfxCount count, const Viewport* viewports) override + setViewports(GfxCount count, const Viewport* viewports) override { m_writer->setViewports(count, viewports); } virtual SLANG_NO_THROW void SLANG_MCALL - setScissorRects(GfxCount count, const ScissorRect* scissors) override + setScissorRects(GfxCount count, const ScissorRect* scissors) override { m_writer->setScissorRects(count, scissors); } - virtual SLANG_NO_THROW void SLANG_MCALL setPrimitiveTopology(PrimitiveTopology topology) override + virtual SLANG_NO_THROW void SLANG_MCALL + setPrimitiveTopology(PrimitiveTopology topology) override { m_writer->setPrimitiveTopology(topology); } @@ -355,13 +362,13 @@ public: } virtual SLANG_NO_THROW void SLANG_MCALL - setIndexBuffer(IBufferResource* buffer, Format indexFormat, Offset offset) override + setIndexBuffer(IBufferResource* buffer, Format indexFormat, Offset offset) override { m_writer->setIndexBuffer(buffer, indexFormat, offset); } virtual SLANG_NO_THROW Result SLANG_MCALL - draw(GfxCount vertexCount, GfxIndex startVertex) override + draw(GfxCount vertexCount, GfxIndex startVertex) override { m_writer->bindRootShaderObject(m_commandBuffer->m_rootShaderObject); m_writer->draw(vertexCount, startVertex); @@ -369,14 +376,15 @@ public: } virtual SLANG_NO_THROW Result SLANG_MCALL - drawIndexed(GfxCount indexCount, GfxIndex startIndex, GfxIndex baseVertex) override + drawIndexed(GfxCount indexCount, GfxIndex startIndex, GfxIndex baseVertex) override { m_writer->bindRootShaderObject(m_commandBuffer->m_rootShaderObject); m_writer->drawIndexed(indexCount, startIndex, baseVertex); return SLANG_OK; } - virtual SLANG_NO_THROW void SLANG_MCALL setStencilReference(uint32_t referenceValue) override + virtual SLANG_NO_THROW void SLANG_MCALL + setStencilReference(uint32_t referenceValue) override { m_writer->setStencilReference(referenceValue); } @@ -448,7 +456,12 @@ public: GfxIndex startInstanceLocation) override { m_writer->bindRootShaderObject(m_commandBuffer->m_rootShaderObject); - m_writer->drawIndexedInstanced(indexCount, instanceCount, startIndexLocation, baseVertexLocation, startInstanceLocation); + m_writer->drawIndexedInstanced( + indexCount, + instanceCount, + startIndexLocation, + baseVertexLocation, + startInstanceLocation); return SLANG_OK; } }; @@ -466,45 +479,47 @@ public: *outEncoder = &m_renderCommandEncoder; } - class ComputeCommandEncoderImpl - : public IComputeCommandEncoder - , public ResourceCommandEncoderImpl + class ComputeCommandEncoderImpl : public IComputeCommandEncoder, + public ResourceCommandEncoderImpl { public: SLANG_GFX_FORWARD_RESOURCE_COMMAND_ENCODER_IMPL(ResourceCommandEncoderImpl) virtual void* getInterface(SlangUUID const& uuid) override { - if (uuid == GfxGUID::IID_IResourceCommandEncoder || uuid == GfxGUID::IID_IComputeCommandEncoder || uuid == ISlangUnknown::getTypeGuid()) + if (uuid == GfxGUID::IID_IResourceCommandEncoder || + uuid == GfxGUID::IID_IComputeCommandEncoder || uuid == ISlangUnknown::getTypeGuid()) { return this; } return nullptr; } + public: - virtual SLANG_NO_THROW void SLANG_MCALL endEncoding() override - { - } + virtual SLANG_NO_THROW void SLANG_MCALL endEncoding() override {} virtual SLANG_NO_THROW Result SLANG_MCALL - bindPipeline(IPipelineState* state, IShaderObject** outRootObject) override + bindPipeline(IPipelineState* state, IShaderObject** outRootObject) 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())); + stateImpl->m_program, + m_commandBuffer->m_rootShaderObject.writeRef())); *outRootObject = m_commandBuffer->m_rootShaderObject.Ptr(); return SLANG_OK; } virtual SLANG_NO_THROW Result SLANG_MCALL - bindPipelineWithRootObject(IPipelineState* state, IShaderObject* rootObject) override + 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())); + stateImpl->m_program, + m_commandBuffer->m_rootShaderObject.writeRef())); m_commandBuffer->m_rootShaderObject->copyFrom( - rootObject, m_commandBuffer->m_transientHeap); + rootObject, + m_commandBuffer->m_transientHeap); return SLANG_OK; } @@ -515,7 +530,8 @@ public: return SLANG_OK; } - virtual SLANG_NO_THROW Result SLANG_MCALL dispatchComputeIndirect(IBufferResource* argBuffer, Offset offset) override + virtual SLANG_NO_THROW Result SLANG_MCALL + dispatchComputeIndirect(IBufferResource* argBuffer, Offset offset) override { SLANG_UNIMPLEMENTED_X("ImmediateRenderBase::dispatchComputeIndirect"); } @@ -523,19 +539,19 @@ public: ComputeCommandEncoderImpl m_computeCommandEncoder; virtual SLANG_NO_THROW void SLANG_MCALL - encodeComputeCommands(IComputeCommandEncoder** outEncoder) override + encodeComputeCommands(IComputeCommandEncoder** outEncoder) override { m_computeCommandEncoder.init(this); *outEncoder = &m_computeCommandEncoder; } virtual SLANG_NO_THROW void SLANG_MCALL - encodeRayTracingCommands(IRayTracingCommandEncoder** outEncoder) override + encodeRayTracingCommands(IRayTracingCommandEncoder** outEncoder) override { *outEncoder = nullptr; } - virtual SLANG_NO_THROW void SLANG_MCALL close() override { } + virtual SLANG_NO_THROW void SLANG_MCALL close() override {} virtual SLANG_NO_THROW Result SLANG_MCALL getNativeHandle(InteropHandle* outHandle) override { @@ -550,25 +566,31 @@ public: switch (name) { case CommandName::SetPipelineState: - m_renderer->setPipelineState(m_writer.getObject(cmd.operands[0])); + m_renderer->setPipelineState( + m_writer.getObject(cmd.operands[0])); break; case CommandName::BindRootShaderObject: - m_renderer->bindRootShaderObject(m_writer.getObject(cmd.operands[0])); + m_renderer->bindRootShaderObject( + m_writer.getObject(cmd.operands[0])); break; case CommandName::SetFramebuffer: m_renderer->setFramebuffer(m_writer.getObject(cmd.operands[0])); break; case CommandName::ClearFrame: m_renderer->clearFrame( - cmd.operands[0], (cmd.operands[1] != 0), (cmd.operands[2] != 0)); + cmd.operands[0], + (cmd.operands[1] != 0), + (cmd.operands[2] != 0)); break; case CommandName::SetViewports: m_renderer->setViewports( - (UInt)cmd.operands[0], m_writer.getData(cmd.operands[1])); + (UInt)cmd.operands[0], + m_writer.getData(cmd.operands[1])); break; case CommandName::SetScissorRects: m_renderer->setScissorRects( - (UInt)cmd.operands[0], m_writer.getData(cmd.operands[1])); + (UInt)cmd.operands[0], + m_writer.getData(cmd.operands[1])); break; case CommandName::SetPrimitiveTopology: m_renderer->setPrimitiveTopology((PrimitiveTopology)cmd.operands[0]); @@ -594,27 +616,33 @@ public: (Format)cmd.operands[1], (UInt)cmd.operands[2]); break; - case CommandName::Draw: - m_renderer->draw(cmd.operands[0], cmd.operands[1]); - break; + case CommandName::Draw: m_renderer->draw(cmd.operands[0], cmd.operands[1]); break; case CommandName::DrawIndexed: - m_renderer->drawIndexed( - cmd.operands[0], cmd.operands[1], cmd.operands[2]); + m_renderer->drawIndexed(cmd.operands[0], cmd.operands[1], cmd.operands[2]); break; case CommandName::DrawInstanced: m_renderer->drawInstanced( - cmd.operands[0], cmd.operands[1], cmd.operands[2], cmd.operands[3]); + cmd.operands[0], + cmd.operands[1], + cmd.operands[2], + cmd.operands[3]); break; case CommandName::DrawIndexedInstanced: m_renderer->drawIndexedInstanced( - cmd.operands[0], cmd.operands[1], cmd.operands[2], cmd.operands[3], cmd.operands[4]); + cmd.operands[0], + cmd.operands[1], + cmd.operands[2], + cmd.operands[3], + cmd.operands[4]); break; case CommandName::SetStencilReference: m_renderer->setStencilReference(cmd.operands[0]); break; case CommandName::DispatchCompute: m_renderer->dispatchCompute( - int(cmd.operands[0]), int(cmd.operands[1]), int(cmd.operands[2])); + int(cmd.operands[0]), + int(cmd.operands[1]), + int(cmd.operands[2])); break; case CommandName::UploadBufferData: m_renderer->uploadBufferData( @@ -632,11 +660,11 @@ public: cmd.operands[4]); break; case CommandName::WriteTimestamp: - m_renderer->writeTimestamp(m_writer.getObject(cmd.operands[0]), (GfxIndex)cmd.operands[1]); - break; - default: - assert(!"unknown command"); + m_renderer->writeTimestamp( + m_writer.getObject(cmd.operands[0]), + (GfxIndex)cmd.operands[1]); break; + default: assert(!"unknown command"); break; } } m_writer.clear(); @@ -668,7 +696,10 @@ public: virtual SLANG_NO_THROW const Desc& SLANG_MCALL getDesc() override { return m_desc; } virtual SLANG_NO_THROW void SLANG_MCALL executeCommandBuffers( - GfxCount count, ICommandBuffer* const* commandBuffers, IFence* fence, uint64_t valueToSignal) override + GfxCount count, + ICommandBuffer* const* commandBuffers, + IFence* fence, + uint64_t valueToSignal) override { // TODO: implement fence signal. assert(fence == nullptr); @@ -676,7 +707,8 @@ public: CommandBufferInfo info = {}; for (GfxIndex i = 0; i < count; i++) { - info.hasWriteTimestamps |= static_cast(commandBuffers[i])->m_writer.m_hasWriteTimestamps; + info.hasWriteTimestamps |= + static_cast(commandBuffers[i])->m_writer.m_hasWriteTimestamps; } static_cast(m_renderer.get())->beginCommandBuffer(info); for (GfxIndex i = 0; i < count; i++) @@ -688,8 +720,8 @@ public: virtual SLANG_NO_THROW void SLANG_MCALL waitOnHost() override { getRenderer()->waitForGpu(); } - virtual SLANG_NO_THROW Result SLANG_MCALL waitForFenceValuesOnDevice( - GfxCount fenceCount, IFence** fences, uint64_t* waitValues) override + virtual SLANG_NO_THROW Result SLANG_MCALL + waitForFenceValuesOnDevice(GfxCount fenceCount, IFence** fences, uint64_t* waitValues) override { return SLANG_FAIL; } @@ -703,7 +735,7 @@ public: using TransientResourceHeapImpl = SimpleTransientResourceHeap; -} +} // namespace ImmediateRendererBase::ImmediateRendererBase() { @@ -720,9 +752,8 @@ SLANG_NO_THROW Result SLANG_MCALL ImmediateRendererBase::createTransientResource return SLANG_OK; } -SLANG_NO_THROW Result SLANG_MCALL ImmediateRendererBase::createCommandQueue( - const ICommandQueue::Desc& desc, - ICommandQueue** outQueue) +SLANG_NO_THROW Result SLANG_MCALL +ImmediateRendererBase::createCommandQueue(const ICommandQueue::Desc& desc, ICommandQueue** outQueue) { SLANG_UNUSED(desc); // Only one queue is supported. @@ -775,4 +806,4 @@ SLANG_NO_THROW SlangResult SLANG_MCALL ImmediateRendererBase::readBufferResource return SLANG_OK; } -} +} // namespace gfx -- cgit v1.2.3