From d94d8e0cc5e5c3bc12da4216209982a636f03144 Mon Sep 17 00:00:00 2001 From: assiduous Date: Tue, 24 Dec 2019 18:03:09 -0800 Subject: Minor formatting updates --- .../src/PipelineStateD3D12Impl.cpp | 6 ++--- .../src/RenderDeviceD3D12Impl.cpp | 30 +++++++++++----------- .../GraphicsEngineD3D12/src/TextureD3D12Impl.cpp | 14 +++++----- 3 files changed, 25 insertions(+), 25 deletions(-) (limited to 'Graphics/GraphicsEngineD3D12') diff --git a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp index ef997858..a068691b 100644 --- a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp @@ -62,9 +62,9 @@ private: std::array m_Map; }; -PipelineStateD3D12Impl ::PipelineStateD3D12Impl(IReferenceCounters* pRefCounters, - RenderDeviceD3D12Impl* pDeviceD3D12, - const PipelineStateDesc& PipelineDesc) : +PipelineStateD3D12Impl::PipelineStateD3D12Impl(IReferenceCounters* pRefCounters, + RenderDeviceD3D12Impl* pDeviceD3D12, + const PipelineStateDesc& PipelineDesc) : TPipelineStateBase{pRefCounters, pDeviceD3D12, PipelineDesc}, m_SRBMemAllocator{GetRawAllocator()} { diff --git a/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp index 9e9ce33d..e67ffb29 100644 --- a/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp @@ -37,7 +37,7 @@ namespace Diligent { -D3D_FEATURE_LEVEL RenderDeviceD3D12Impl ::GetD3DFeatureLevel() const +D3D_FEATURE_LEVEL RenderDeviceD3D12Impl::GetD3DFeatureLevel() const { D3D_FEATURE_LEVEL FeatureLevels[] = { @@ -56,13 +56,13 @@ D3D_FEATURE_LEVEL RenderDeviceD3D12Impl ::GetD3DFeatureLevel() const return FeatureLevelsData.MaxSupportedFeatureLevel; } -RenderDeviceD3D12Impl ::RenderDeviceD3D12Impl(IReferenceCounters* pRefCounters, - IMemoryAllocator& RawMemAllocator, - IEngineFactory* pEngineFactory, - const EngineD3D12CreateInfo& EngineCI, - ID3D12Device* pd3d12Device, - size_t CommandQueueCount, - ICommandQueueD3D12** ppCmdQueues) : +RenderDeviceD3D12Impl::RenderDeviceD3D12Impl(IReferenceCounters* pRefCounters, + IMemoryAllocator& RawMemAllocator, + IEngineFactory* pEngineFactory, + const EngineD3D12CreateInfo& EngineCI, + ID3D12Device* pd3d12Device, + size_t CommandQueueCount, + ICommandQueueD3D12** ppCmdQueues) : // clang-format off TRenderDeviceBase { @@ -348,7 +348,7 @@ void RenderDeviceD3D12Impl::CreatePipelineState(const PipelineStateDesc& Pipelin }); } -void RenderDeviceD3D12Impl ::CreateBufferFromD3DResource(ID3D12Resource* pd3d12Buffer, const BufferDesc& BuffDesc, RESOURCE_STATE InitialState, IBuffer** ppBuffer) +void RenderDeviceD3D12Impl::CreateBufferFromD3DResource(ID3D12Resource* pd3d12Buffer, const BufferDesc& BuffDesc, RESOURCE_STATE InitialState, IBuffer** ppBuffer) { CreateDeviceObject("buffer", BuffDesc, ppBuffer, [&]() // @@ -360,7 +360,7 @@ void RenderDeviceD3D12Impl ::CreateBufferFromD3DResource(ID3D12Resource* pd3d12B }); } -void RenderDeviceD3D12Impl ::CreateBuffer(const BufferDesc& BuffDesc, const BufferData* pBuffData, IBuffer** ppBuffer) +void RenderDeviceD3D12Impl::CreateBuffer(const BufferDesc& BuffDesc, const BufferData* pBuffData, IBuffer** ppBuffer) { CreateDeviceObject("buffer", BuffDesc, ppBuffer, [&]() // @@ -373,7 +373,7 @@ void RenderDeviceD3D12Impl ::CreateBuffer(const BufferDesc& BuffDesc, const Buff } -void RenderDeviceD3D12Impl ::CreateShader(const ShaderCreateInfo& ShaderCI, IShader** ppShader) +void RenderDeviceD3D12Impl::CreateShader(const ShaderCreateInfo& ShaderCI, IShader** ppShader) { CreateDeviceObject("shader", ShaderCI.Desc, ppShader, [&]() // @@ -410,7 +410,7 @@ void RenderDeviceD3D12Impl::CreateTexture(const TextureDesc& TexDesc, ID3D12Reso }); } -void RenderDeviceD3D12Impl ::CreateTexture(const TextureDesc& TexDesc, const TextureData* pData, ITexture** ppTexture) +void RenderDeviceD3D12Impl::CreateTexture(const TextureDesc& TexDesc, const TextureData* pData, ITexture** ppTexture) { CreateDeviceObject("texture", TexDesc, ppTexture, [&]() // @@ -423,7 +423,7 @@ void RenderDeviceD3D12Impl ::CreateTexture(const TextureDesc& TexDesc, const Tex }); } -void RenderDeviceD3D12Impl ::CreateSampler(const SamplerDesc& SamplerDesc, ISampler** ppSampler) +void RenderDeviceD3D12Impl::CreateSampler(const SamplerDesc& SamplerDesc, ISampler** ppSampler) { CreateDeviceObject("sampler", SamplerDesc, ppSampler, [&]() // @@ -450,13 +450,13 @@ void RenderDeviceD3D12Impl::CreateFence(const FenceDesc& Desc, IFence** ppFence) }); } -DescriptorHeapAllocation RenderDeviceD3D12Impl ::AllocateDescriptor(D3D12_DESCRIPTOR_HEAP_TYPE Type, UINT Count /*= 1*/) +DescriptorHeapAllocation RenderDeviceD3D12Impl::AllocateDescriptor(D3D12_DESCRIPTOR_HEAP_TYPE Type, UINT Count /*= 1*/) { VERIFY(Type >= D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV && Type < D3D12_DESCRIPTOR_HEAP_TYPE_NUM_TYPES, "Invalid heap type"); return m_CPUDescriptorHeaps[Type].Allocate(Count); } -DescriptorHeapAllocation RenderDeviceD3D12Impl ::AllocateGPUDescriptors(D3D12_DESCRIPTOR_HEAP_TYPE Type, UINT Count /*= 1*/) +DescriptorHeapAllocation RenderDeviceD3D12Impl::AllocateGPUDescriptors(D3D12_DESCRIPTOR_HEAP_TYPE Type, UINT Count /*= 1*/) { VERIFY(Type >= D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV && Type <= D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, "Invalid heap type"); return m_GPUDescriptorHeaps[Type].Allocate(Count); diff --git a/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp index b5159a3f..90d0af38 100644 --- a/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp @@ -75,7 +75,7 @@ DXGI_FORMAT GetClearFormat(DXGI_FORMAT Fmt, D3D12_RESOURCE_FLAGS Flags) return Fmt; } -D3D12_RESOURCE_DESC TextureD3D12Impl ::GetD3D12TextureDesc() const +D3D12_RESOURCE_DESC TextureD3D12Impl::GetD3D12TextureDesc() const { D3D12_RESOURCE_DESC Desc = {}; @@ -124,11 +124,11 @@ D3D12_RESOURCE_DESC TextureD3D12Impl ::GetD3D12TextureDesc() const return Desc; } -TextureD3D12Impl ::TextureD3D12Impl(IReferenceCounters* pRefCounters, - FixedBlockMemoryAllocator& TexViewObjAllocator, - RenderDeviceD3D12Impl* pRenderDeviceD3D12, - const TextureDesc& TexDesc, - const TextureData* pInitData /*= nullptr*/) : +TextureD3D12Impl::TextureD3D12Impl(IReferenceCounters* pRefCounters, + FixedBlockMemoryAllocator& TexViewObjAllocator, + RenderDeviceD3D12Impl* pRenderDeviceD3D12, + const TextureDesc& TexDesc, + const TextureData* pInitData /*= nullptr*/) : TTextureBase{pRefCounters, TexViewObjAllocator, pRenderDeviceD3D12, TexDesc} { if (m_Desc.Usage == USAGE_STATIC && (pInitData == nullptr || pInitData->pSubResources == nullptr)) @@ -505,7 +505,7 @@ void TextureD3D12Impl::CreateViewInternal(const struct TextureViewDesc& ViewDesc } } -TextureD3D12Impl ::~TextureD3D12Impl() +TextureD3D12Impl::~TextureD3D12Impl() { // D3D12 object can only be destroyed when it is no longer used by the GPU auto* pDeviceD3D12Impl = ValidatedCast(GetDevice()); -- cgit v1.2.3