diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-01-26 21:44:37 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-01-26 21:44:37 +0000 |
| commit | 38ad2d5cb659074ad9b4bde16bcbf71481719b94 (patch) | |
| tree | 519ded6e25d22d63f7be706c3d71aaf7dd2a6279 /Graphics | |
| parent | Renamed .h -> .hpp files in GLSLTools, GraphicsAccessories, and GraphicsTools... (diff) | |
| download | DiligentCore-38ad2d5cb659074ad9b4bde16bcbf71481719b94.tar.gz DiligentCore-38ad2d5cb659074ad9b4bde16bcbf71481719b94.zip | |
Renamed .h -> .hpp in GraphicsEngine, GraphicsEngineD3DBase, GraphicsEningeD3D11, and GraphicsEningeD3D12 projects
Diffstat (limited to 'Graphics')
181 files changed, 1330 insertions, 1330 deletions
diff --git a/Graphics/GLSLTools/src/SPIRVShaderResources.cpp b/Graphics/GLSLTools/src/SPIRVShaderResources.cpp index b51c2a00..4d9fc6d5 100644 --- a/Graphics/GLSLTools/src/SPIRVShaderResources.cpp +++ b/Graphics/GLSLTools/src/SPIRVShaderResources.cpp @@ -29,7 +29,7 @@ #include "SPIRVShaderResources.hpp" #include "spirv_parser.hpp" #include "spirv_cross.hpp" -#include "ShaderBase.h" +#include "ShaderBase.hpp" #include "GraphicsAccessories.hpp" #include "StringTools.h" #include "Align.h" diff --git a/Graphics/GraphicsEngine/CMakeLists.txt b/Graphics/GraphicsEngine/CMakeLists.txt index f28c3db1..037af6fa 100644 --- a/Graphics/GraphicsEngine/CMakeLists.txt +++ b/Graphics/GraphicsEngine/CMakeLists.txt @@ -3,29 +3,29 @@ cmake_minimum_required (VERSION 3.6) project(Diligent-GraphicsEngine CXX) set(INCLUDE - include/BufferBase.h - include/BufferViewBase.h - include/CommandListBase.h + include/BufferBase.hpp + include/BufferViewBase.hpp + include/CommandListBase.hpp include/DefaultShaderSourceStreamFactory.h include/Defines.h - include/DeviceContextBase.h - include/DeviceObjectBase.h - include/EngineFactoryBase.h + include/DeviceContextBase.hpp + include/DeviceObjectBase.hpp + include/EngineFactoryBase.hpp include/EngineMemory.h - include/FenceBase.h + include/FenceBase.hpp include/pch.h - include/PipelineStateBase.h - include/QueryBase.h - include/RenderDeviceBase.h - include/ResourceMappingImpl.h - include/SamplerBase.h - include/ShaderBase.h - include/ShaderResourceBindingBase.h - include/ShaderResourceVariableBase.h - include/StateObjectsRegistry.h - include/SwapChainBase.h - include/TextureBase.h - include/TextureViewBase.h + include/PipelineStateBase.hpp + include/QueryBase.hpp + include/RenderDeviceBase.hpp + include/ResourceMappingImpl.hpp + include/SamplerBase.hpp + include/ShaderBase.hpp + include/ShaderResourceBindingBase.hpp + include/ShaderResourceVariableBase.hpp + include/StateObjectsRegistry.hpp + include/SwapChainBase.hpp + include/TextureBase.hpp + include/TextureViewBase.hpp ) set(INTERFACE diff --git a/Graphics/GraphicsEngine/include/BufferBase.h b/Graphics/GraphicsEngine/include/BufferBase.hpp index 388625b1..a40978f7 100644 --- a/Graphics/GraphicsEngine/include/BufferBase.h +++ b/Graphics/GraphicsEngine/include/BufferBase.hpp @@ -32,7 +32,7 @@ #include "Buffer.h" #include "GraphicsTypes.h" -#include "DeviceObjectBase.h" +#include "DeviceObjectBase.hpp" #include "GraphicsAccessories.hpp" #include "STDAllocator.h" #include <memory> diff --git a/Graphics/GraphicsEngine/include/BufferViewBase.h b/Graphics/GraphicsEngine/include/BufferViewBase.hpp index 59e9a14a..37e80756 100644 --- a/Graphics/GraphicsEngine/include/BufferViewBase.h +++ b/Graphics/GraphicsEngine/include/BufferViewBase.hpp @@ -31,7 +31,7 @@ /// Implementation of the Diligent::BufferViewBase template class #include "BufferView.h" -#include "DeviceObjectBase.h" +#include "DeviceObjectBase.hpp" #include "GraphicsTypes.h" #include "RefCntAutoPtr.h" diff --git a/Graphics/GraphicsEngine/include/CommandListBase.h b/Graphics/GraphicsEngine/include/CommandListBase.hpp index 2fda804b..051eb737 100644 --- a/Graphics/GraphicsEngine/include/CommandListBase.h +++ b/Graphics/GraphicsEngine/include/CommandListBase.hpp @@ -31,8 +31,8 @@ /// Implementation of the Diligent::CommandListBase template class #include "CommandList.h" -#include "DeviceObjectBase.h" -#include "RenderDeviceBase.h" +#include "DeviceObjectBase.hpp" +#include "RenderDeviceBase.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngine/include/DeviceContextBase.h b/Graphics/GraphicsEngine/include/DeviceContextBase.hpp index c6ed1793..87604f84 100644 --- a/Graphics/GraphicsEngine/include/DeviceContextBase.h +++ b/Graphics/GraphicsEngine/include/DeviceContextBase.hpp @@ -33,14 +33,14 @@ #include <unordered_map> #include "DeviceContext.h" -#include "DeviceObjectBase.h" +#include "DeviceObjectBase.hpp" #include "ResourceMapping.h" #include "Sampler.h" #include "ObjectBase.h" #include "DebugUtilities.h" #include "ValidatedCast.h" #include "GraphicsAccessories.hpp" -#include "TextureBase.h" +#include "TextureBase.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngine/include/DeviceObjectBase.h b/Graphics/GraphicsEngine/include/DeviceObjectBase.hpp index 31a00f40..31a00f40 100644 --- a/Graphics/GraphicsEngine/include/DeviceObjectBase.h +++ b/Graphics/GraphicsEngine/include/DeviceObjectBase.hpp diff --git a/Graphics/GraphicsEngine/include/EngineFactoryBase.h b/Graphics/GraphicsEngine/include/EngineFactoryBase.hpp index 2e0b954c..2e0b954c 100644 --- a/Graphics/GraphicsEngine/include/EngineFactoryBase.h +++ b/Graphics/GraphicsEngine/include/EngineFactoryBase.hpp diff --git a/Graphics/GraphicsEngine/include/FenceBase.h b/Graphics/GraphicsEngine/include/FenceBase.hpp index 2fac4355..b596e8c8 100644 --- a/Graphics/GraphicsEngine/include/FenceBase.h +++ b/Graphics/GraphicsEngine/include/FenceBase.hpp @@ -30,7 +30,7 @@ /// \file /// Implementation of the Diligent::FenceBase template class -#include "DeviceObjectBase.h" +#include "DeviceObjectBase.hpp" #include "GraphicsTypes.h" #include "RefCntAutoPtr.h" diff --git a/Graphics/GraphicsEngine/include/PipelineStateBase.h b/Graphics/GraphicsEngine/include/PipelineStateBase.hpp index fd3563a0..5dddbaea 100644 --- a/Graphics/GraphicsEngine/include/PipelineStateBase.h +++ b/Graphics/GraphicsEngine/include/PipelineStateBase.hpp @@ -34,7 +34,7 @@ #include <vector> #include "PipelineState.h" -#include "DeviceObjectBase.h" +#include "DeviceObjectBase.hpp" #include "STDAllocator.h" #include "EngineMemory.h" #include "GraphicsAccessories.hpp" diff --git a/Graphics/GraphicsEngine/include/QueryBase.h b/Graphics/GraphicsEngine/include/QueryBase.hpp index daa0d30e..91e5f034 100644 --- a/Graphics/GraphicsEngine/include/QueryBase.h +++ b/Graphics/GraphicsEngine/include/QueryBase.hpp @@ -31,7 +31,7 @@ /// Implementation of Diligent::QueryBase template class #include "Query.h" -#include "DeviceObjectBase.h" +#include "DeviceObjectBase.hpp" #include "GraphicsTypes.h" #include "RefCntAutoPtr.h" diff --git a/Graphics/GraphicsEngine/include/RenderDeviceBase.h b/Graphics/GraphicsEngine/include/RenderDeviceBase.hpp index 68ab63a6..8c16321d 100644 --- a/Graphics/GraphicsEngine/include/RenderDeviceBase.h +++ b/Graphics/GraphicsEngine/include/RenderDeviceBase.hpp @@ -31,10 +31,10 @@ /// Implementation of the Diligent::RenderDeviceBase template class and related structures #include "RenderDevice.h" -#include "DeviceObjectBase.h" +#include "DeviceObjectBase.hpp" #include "Defines.h" -#include "ResourceMappingImpl.h" -#include "StateObjectsRegistry.h" +#include "ResourceMappingImpl.hpp" +#include "StateObjectsRegistry.hpp" #include "HashUtils.h" #include "ObjectBase.h" #include "DeviceContext.h" diff --git a/Graphics/GraphicsEngine/include/ResourceMappingImpl.h b/Graphics/GraphicsEngine/include/ResourceMappingImpl.hpp index 011e4e7a..011e4e7a 100644 --- a/Graphics/GraphicsEngine/include/ResourceMappingImpl.h +++ b/Graphics/GraphicsEngine/include/ResourceMappingImpl.hpp diff --git a/Graphics/GraphicsEngine/include/SamplerBase.h b/Graphics/GraphicsEngine/include/SamplerBase.hpp index aa408556..4c9c505d 100644 --- a/Graphics/GraphicsEngine/include/SamplerBase.h +++ b/Graphics/GraphicsEngine/include/SamplerBase.hpp @@ -31,8 +31,8 @@ /// Implementation of the Diligent::SamplerBase template class #include "Sampler.h" -#include "DeviceObjectBase.h" -#include "RenderDeviceBase.h" +#include "DeviceObjectBase.hpp" +#include "RenderDeviceBase.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngine/include/ShaderBase.h b/Graphics/GraphicsEngine/include/ShaderBase.hpp index cf99cdc0..252f11ac 100644 --- a/Graphics/GraphicsEngine/include/ShaderBase.h +++ b/Graphics/GraphicsEngine/include/ShaderBase.hpp @@ -33,7 +33,7 @@ #include <vector> #include "Shader.h" -#include "DeviceObjectBase.h" +#include "DeviceObjectBase.hpp" #include "STDAllocator.h" #include "PlatformMisc.h" #include "EngineMemory.h" diff --git a/Graphics/GraphicsEngine/include/ShaderResourceBindingBase.h b/Graphics/GraphicsEngine/include/ShaderResourceBindingBase.hpp index 9600294c..9600294c 100644 --- a/Graphics/GraphicsEngine/include/ShaderResourceBindingBase.h +++ b/Graphics/GraphicsEngine/include/ShaderResourceBindingBase.hpp diff --git a/Graphics/GraphicsEngine/include/ShaderResourceVariableBase.h b/Graphics/GraphicsEngine/include/ShaderResourceVariableBase.hpp index 4e8f49e0..4e8f49e0 100644 --- a/Graphics/GraphicsEngine/include/ShaderResourceVariableBase.h +++ b/Graphics/GraphicsEngine/include/ShaderResourceVariableBase.hpp diff --git a/Graphics/GraphicsEngine/include/StateObjectsRegistry.h b/Graphics/GraphicsEngine/include/StateObjectsRegistry.hpp index f3484bc1..f3484bc1 100644 --- a/Graphics/GraphicsEngine/include/StateObjectsRegistry.h +++ b/Graphics/GraphicsEngine/include/StateObjectsRegistry.hpp diff --git a/Graphics/GraphicsEngine/include/SwapChainBase.h b/Graphics/GraphicsEngine/include/SwapChainBase.hpp index 7db31f8d..7db31f8d 100644 --- a/Graphics/GraphicsEngine/include/SwapChainBase.h +++ b/Graphics/GraphicsEngine/include/SwapChainBase.hpp diff --git a/Graphics/GraphicsEngine/include/TextureBase.h b/Graphics/GraphicsEngine/include/TextureBase.hpp index 8a3bc8d3..9e1a29ed 100644 --- a/Graphics/GraphicsEngine/include/TextureBase.h +++ b/Graphics/GraphicsEngine/include/TextureBase.hpp @@ -32,7 +32,7 @@ #include "Texture.h" #include "GraphicsTypes.h" -#include "DeviceObjectBase.h" +#include "DeviceObjectBase.hpp" #include "GraphicsAccessories.hpp" #include "STDAllocator.h" #include "FormatString.h" diff --git a/Graphics/GraphicsEngine/include/TextureViewBase.h b/Graphics/GraphicsEngine/include/TextureViewBase.hpp index 3a2c4e90..f9879264 100644 --- a/Graphics/GraphicsEngine/include/TextureViewBase.h +++ b/Graphics/GraphicsEngine/include/TextureViewBase.hpp @@ -31,7 +31,7 @@ /// Implementation of the Diligent::TextureViewBase template class #include "TextureView.h" -#include "DeviceObjectBase.h" +#include "DeviceObjectBase.hpp" #include "RefCntAutoPtr.h" #include "GraphicsAccessories.hpp" diff --git a/Graphics/GraphicsEngine/include/pch.h b/Graphics/GraphicsEngine/include/pch.h index aa47fb15..1472ead3 100644 --- a/Graphics/GraphicsEngine/include/pch.h +++ b/Graphics/GraphicsEngine/include/pch.h @@ -41,5 +41,5 @@ #include "RefCntAutoPtr.h" #include "Errors.h" #include "DebugUtilities.h" -#include "RenderDeviceBase.h" -#include "DeviceContextBase.h"
\ No newline at end of file +#include "RenderDeviceBase.hpp" +#include "DeviceContextBase.hpp"
\ No newline at end of file diff --git a/Graphics/GraphicsEngine/src/ResourceMapping.cpp b/Graphics/GraphicsEngine/src/ResourceMapping.cpp index 11acb714..bf34056c 100644 --- a/Graphics/GraphicsEngine/src/ResourceMapping.cpp +++ b/Graphics/GraphicsEngine/src/ResourceMapping.cpp @@ -26,8 +26,8 @@ */ #include "pch.h" -#include "ResourceMappingImpl.h" -#include "DeviceObjectBase.h" +#include "ResourceMappingImpl.hpp" +#include "DeviceObjectBase.hpp" using namespace std; diff --git a/Graphics/GraphicsEngineD3D11/CMakeLists.txt b/Graphics/GraphicsEngineD3D11/CMakeLists.txt index ab544ad1..614f6264 100644 --- a/Graphics/GraphicsEngineD3D11/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3D11/CMakeLists.txt @@ -4,32 +4,32 @@ project(Diligent-GraphicsEngineD3D11 CXX) set(INCLUDE - include/BufferD3D11Impl.h - include/BufferViewD3D11Impl.h - include/CommandListD3D11Impl.h + include/BufferD3D11Impl.hpp + include/BufferViewD3D11Impl.hpp + include/CommandListD3D11Impl.hpp include/D3D11TypeConversions.h include/D3D11TypeDefinitions.h - include/DeviceContextD3D11Impl.h - include/DisjointQueryPool.h + include/DeviceContextD3D11Impl.hpp + include/DisjointQueryPool.hpp include/EngineD3D11Defines.h include/pch.h - include/FenceD3D11Impl.h - include/PipelineStateD3D11Impl.h - include/QueryD3D11Impl.h - include/RenderDeviceD3D11Impl.h - include/SamplerD3D11Impl.h - include/ShaderD3D11Impl.h - include/ShaderResourceBindingD3D11Impl.h - include/ShaderResourceCacheD3D11.h - include/ShaderResourceLayoutD3D11.h - include/ShaderResourcesD3D11.h - include/SwapChainD3D11Impl.h + include/FenceD3D11Impl.hpp + include/PipelineStateD3D11Impl.hpp + include/QueryD3D11Impl.hpp + include/RenderDeviceD3D11Impl.hpp + include/SamplerD3D11Impl.hpp + include/ShaderD3D11Impl.hpp + include/ShaderResourceBindingD3D11Impl.hpp + include/ShaderResourceCacheD3D11.hpp + include/ShaderResourceLayoutD3D11.hpp + include/ShaderResourcesD3D11.hpp + include/SwapChainD3D11Impl.hpp include/targetver.h - include/Texture1D_D3D11.h - include/Texture2D_D3D11.h - include/Texture3D_D3D11.h - include/TextureBaseD3D11.h - include/TextureViewD3D11Impl.h + include/Texture1D_D3D11.hpp + include/Texture2D_D3D11.hpp + include/Texture3D_D3D11.hpp + include/TextureBaseD3D11.hpp + include/TextureViewD3D11Impl.hpp ) set(INTERFACE diff --git a/Graphics/GraphicsEngineD3D11/include/BufferD3D11Impl.h b/Graphics/GraphicsEngineD3D11/include/BufferD3D11Impl.hpp index 77c74f45..1deb3f91 100644 --- a/Graphics/GraphicsEngineD3D11/include/BufferD3D11Impl.h +++ b/Graphics/GraphicsEngineD3D11/include/BufferD3D11Impl.hpp @@ -32,9 +32,9 @@ #include "BufferD3D11.h" #include "RenderDeviceD3D11.h" -#include "BufferBase.h" -#include "BufferViewD3D11Impl.h" -#include "RenderDeviceD3D11Impl.h" +#include "BufferBase.hpp" +#include "BufferViewD3D11Impl.hpp" +#include "RenderDeviceD3D11Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/include/BufferViewD3D11Impl.h b/Graphics/GraphicsEngineD3D11/include/BufferViewD3D11Impl.hpp index a44eae3a..a0067e3c 100644 --- a/Graphics/GraphicsEngineD3D11/include/BufferViewD3D11Impl.h +++ b/Graphics/GraphicsEngineD3D11/include/BufferViewD3D11Impl.hpp @@ -32,8 +32,8 @@ #include "BufferViewD3D11.h" #include "RenderDeviceD3D11.h" -#include "BufferViewBase.h" -#include "RenderDeviceD3D11Impl.h" +#include "BufferViewBase.hpp" +#include "RenderDeviceD3D11Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/include/CommandListD3D11Impl.h b/Graphics/GraphicsEngineD3D11/include/CommandListD3D11Impl.hpp index 5394a37b..031e8339 100644 --- a/Graphics/GraphicsEngineD3D11/include/CommandListD3D11Impl.h +++ b/Graphics/GraphicsEngineD3D11/include/CommandListD3D11Impl.hpp @@ -31,8 +31,8 @@ /// Declaration of Diligent::CommandListD3D11Impl class #include "RenderDeviceD3D11.h" -#include "CommandListBase.h" -#include "RenderDeviceD3D11Impl.h" +#include "CommandListBase.hpp" +#include "RenderDeviceD3D11Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/include/DeviceContextD3D11Impl.h b/Graphics/GraphicsEngineD3D11/include/DeviceContextD3D11Impl.hpp index 162a1285..f1105509 100755..100644 --- a/Graphics/GraphicsEngineD3D11/include/DeviceContextD3D11Impl.h +++ b/Graphics/GraphicsEngineD3D11/include/DeviceContextD3D11Impl.hpp @@ -1,438 +1,438 @@ -/*
- * Copyright 2019-2020 Diligent Graphics LLC
- * Copyright 2015-2019 Egor Yusov
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * In no event and under no legal theory, whether in tort (including negligence),
- * contract, or otherwise, unless required by applicable law (such as deliberate
- * and grossly negligent acts) or agreed to in writing, shall any Contributor be
- * liable for any damages, including any direct, indirect, special, incidental,
- * or consequential damages of any character arising as a result of this License or
- * out of the use or inability to use the software (including but not limited to damages
- * for loss of goodwill, work stoppage, computer failure or malfunction, or any and
- * all other commercial damages or losses), even if such Contributor has been advised
- * of the possibility of such damages.
- */
-
-#pragma once
-
-/// \file
-/// Declaration of Diligent::DeviceContextD3D11Impl class
-
-#include "DeviceContextD3D11.h"
-#include "DeviceContextBase.h"
-#include "ShaderD3D11Impl.h"
-#include "BufferD3D11Impl.h"
-#include "TextureBaseD3D11.h"
-#include "PipelineStateD3D11Impl.h"
-#include "QueryD3D11Impl.h"
-#include "DisjointQueryPool.h"
-
-#ifdef _DEBUG
-# define VERIFY_CONTEXT_BINDINGS
-#endif
-
-namespace Diligent
-{
-
-class RenderDeviceD3D11Impl;
-
-struct DeviceContextD3D11ImplTraits
-{
- using BufferType = BufferD3D11Impl;
- using TextureType = TextureBaseD3D11;
- using PipelineStateType = PipelineStateD3D11Impl;
- using DeviceType = RenderDeviceD3D11Impl;
- using QueryType = QueryD3D11Impl;
-};
-
-/// Device context implementation in Direct3D11 backend.
-class DeviceContextD3D11Impl final : public DeviceContextBase<IDeviceContextD3D11, DeviceContextD3D11ImplTraits>
-{
-public:
- using TDeviceContextBase = DeviceContextBase<IDeviceContextD3D11, DeviceContextD3D11ImplTraits>;
-
- DeviceContextD3D11Impl(IReferenceCounters* pRefCounters,
- IMemoryAllocator& Allocator,
- RenderDeviceD3D11Impl* pDevice,
- ID3D11DeviceContext* pd3d11DeviceContext,
- const struct EngineD3D11CreateInfo& EngineAttribs,
- bool bIsDeferred);
- virtual void QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override final;
-
- /// Implementation of IDeviceContext::SetPipelineState() in Direct3D11 backend.
- virtual void SetPipelineState(IPipelineState* pPipelineState) override final;
-
- /// Implementation of IDeviceContext::TransitionShaderResources() in Direct3D11 backend.
- virtual void TransitionShaderResources(IPipelineState* pPipelineState, IShaderResourceBinding* pShaderResourceBinding) override final;
-
- /// Implementation of IDeviceContext::CommitShaderResources() in Direct3D11 backend.
- virtual void CommitShaderResources(IShaderResourceBinding* pShaderResourceBinding, RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final;
-
- /// Implementation of IDeviceContext::SetStencilRef() in Direct3D11 backend.
- virtual void SetStencilRef(Uint32 StencilRef) override final;
-
- /// Implementation of IDeviceContext::SetBlendFactors() in Direct3D11 backend.
- virtual void SetBlendFactors(const float* pBlendFactors = nullptr) override final;
-
- /// Implementation of IDeviceContext::SetVertexBuffers() in Direct3D11 backend.
- virtual void SetVertexBuffers(Uint32 StartSlot,
- Uint32 NumBuffersSet,
- IBuffer** ppBuffers,
- Uint32* pOffsets,
- RESOURCE_STATE_TRANSITION_MODE StateTransitionMode,
- SET_VERTEX_BUFFERS_FLAGS Flags) override final;
-
- /// Implementation of IDeviceContext::InvalidateState() in Direct3D11 backend.
- virtual void InvalidateState() override final;
-
- /// Implementation of IDeviceContext::SetIndexBuffer() in Direct3D11 backend.
- virtual void SetIndexBuffer(IBuffer* pIndexBuffer, Uint32 ByteOffset, RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final;
-
- /// Implementation of IDeviceContext::SetViewports() in Direct3D11 backend.
- virtual void SetViewports(Uint32 NumViewports, const Viewport* pViewports, Uint32 RTWidth, Uint32 RTHeight) override final;
-
- /// Implementation of IDeviceContext::SetScissorRects() in Direct3D11 backend.
- virtual void SetScissorRects(Uint32 NumRects, const Rect* pRects, Uint32 RTWidth, Uint32 RTHeight) override final;
-
- /// Implementation of IDeviceContext::SetRenderTargets() in Direct3D11 backend.
- virtual void SetRenderTargets(Uint32 NumRenderTargets,
- ITextureView* ppRenderTargets[],
- ITextureView* pDepthStencil,
- RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final;
-
- /// Implementation of IDeviceContext::Draw() in Direct3D11 backend.
- virtual void Draw(const DrawAttribs& Attribs) override final;
- /// Implementation of IDeviceContext::DrawIndexed() in Direct3D11 backend.
- virtual void DrawIndexed(const DrawIndexedAttribs& Attribs) override final;
- /// Implementation of IDeviceContext::DrawIndirect() in Direct3D11 backend.
- virtual void DrawIndirect(const DrawIndirectAttribs& Attribs, IBuffer* pAttribsBuffer) override final;
- /// Implementation of IDeviceContext::DrawIndexedIndirect() in Direct3D11 backend.
- virtual void DrawIndexedIndirect(const DrawIndexedIndirectAttribs& Attribs, IBuffer* pAttribsBuffer) override final;
-
- /// Implementation of IDeviceContext::DispatchCompute() in Direct3D11 backend.
- virtual void DispatchCompute(const DispatchComputeAttribs& Attribs) override final;
- /// Implementation of IDeviceContext::DispatchComputeIndirect() in Direct3D11 backend.
- virtual void DispatchComputeIndirect(const DispatchComputeIndirectAttribs& Attribs, IBuffer* pAttribsBuffer) override final;
-
- /// Implementation of IDeviceContext::ClearDepthStencil() in Direct3D11 backend.
- virtual void ClearDepthStencil(ITextureView* pView,
- CLEAR_DEPTH_STENCIL_FLAGS ClearFlags,
- float fDepth,
- Uint8 Stencil,
- RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final;
-
- /// Implementation of IDeviceContext::ClearRenderTarget() in Direct3D11 backend.
- virtual void ClearRenderTarget(ITextureView* pView, const float* RGBA, RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final;
-
- /// Implementation of IDeviceContext::UpdateBuffer() in Direct3D11 backend.
- virtual void UpdateBuffer(IBuffer* pBuffer,
- Uint32 Offset,
- Uint32 Size,
- const void* pData,
- RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final;
-
- /// Implementation of IDeviceContext::CopyBuffer() in Direct3D11 backend.
- virtual void CopyBuffer(IBuffer* pSrcBuffer,
- Uint32 SrcOffset,
- RESOURCE_STATE_TRANSITION_MODE SrcBufferTransitionMode,
- IBuffer* pDstBuffer,
- Uint32 DstOffset,
- Uint32 Size,
- RESOURCE_STATE_TRANSITION_MODE DstBufferTransitionMode) override final;
-
- /// Implementation of IDeviceContext::MapBuffer() in Direct3D11 backend.
- virtual void MapBuffer(IBuffer* pBuffer, MAP_TYPE MapType, MAP_FLAGS MapFlags, PVoid& pMappedData) override final;
-
- /// Implementation of IDeviceContext::UnmapBuffer() in Direct3D11 backend.
- virtual void UnmapBuffer(IBuffer* pBuffer, MAP_TYPE MapType) override final;
-
- /// Implementation of IDeviceContext::UpdateTexture() in Direct3D11 backend.
- virtual void UpdateTexture(ITexture* pTexture,
- Uint32 MipLevel,
- Uint32 Slice,
- const Box& DstBox,
- const TextureSubResData& SubresData,
- RESOURCE_STATE_TRANSITION_MODE SrcBufferTransitionMode,
- RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final;
-
- /// Implementation of IDeviceContext::CopyTexture() in Direct3D11 backend.
- virtual void CopyTexture(const CopyTextureAttribs& CopyAttribs) override final;
-
- /// Implementation of IDeviceContext::MapTextureSubresource() in Direct3D11 backend.
- virtual void MapTextureSubresource(ITexture* pTexture,
- Uint32 MipLevel,
- Uint32 ArraySlice,
- MAP_TYPE MapType,
- MAP_FLAGS MapFlags,
- const Box* pMapRegion,
- MappedTextureSubresource& MappedData) override final;
-
- /// Implementation of IDeviceContext::UnmapTextureSubresource() in Direct3D11 backend.
- virtual void UnmapTextureSubresource(ITexture* pTexture, Uint32 MipLevel, Uint32 ArraySlice) override final;
-
- /// Implementation of IDeviceContext::GenerateMips() in Direct3D11 backend.
- virtual void GenerateMips(ITextureView* pTextureView) override final;
-
- /// Implementation of IDeviceContext::FinishFrame() in Direct3D11 backend.
- virtual void FinishFrame() override final;
-
- /// Implementation of IDeviceContext::TransitionResourceStates() in Direct3D11 backend.
- virtual void TransitionResourceStates(Uint32 BarrierCount, StateTransitionDesc* pResourceBarriers) override final;
-
- /// Implementation of IDeviceContext::ResolveTextureSubresource() in Direct3D11 backend.
- virtual void ResolveTextureSubresource(ITexture* pSrcTexture,
- ITexture* pDstTexture,
- const ResolveTextureSubresourceAttribs& ResolveAttribs) override final;
-
- /// Implementation of IDeviceContext::FinishCommandList() in Direct3D11 backend.
- void FinishCommandList(class ICommandList** ppCommandList) override final;
-
- /// Implementation of IDeviceContext::ExecuteCommandList() in Direct3D11 backend.
- virtual void ExecuteCommandList(class ICommandList* pCommandList) override final;
-
- /// Implementation of IDeviceContext::SignalFence() in Direct3D11 backend.
- virtual void SignalFence(IFence* pFence, Uint64 Value) override final;
-
- /// Implementation of IDeviceContext::WaitForFence() in Direct3D11 backend.
- virtual void WaitForFence(IFence* pFence, Uint64 Value, bool FlushContext) override final;
-
- /// Implementation of IDeviceContext::WaitForIdle() in Direct3D11 backend.
- virtual void WaitForIdle() override final;
-
- /// Implementation of IDeviceContext::BeginQuery() in Direct3D11 backend.
- virtual void BeginQuery(IQuery* pQuery) override final;
-
- /// Implementation of IDeviceContext::EndQuery() in Direct3D11 backend.
- virtual void EndQuery(IQuery* pQuery) override final;
-
- /// Implementation of IDeviceContext::Flush() in Direct3D11 backend.
- virtual void Flush() override final;
-
- /// Implementation of IDeviceContextD3D11::GetD3D11DeviceContext().
- virtual ID3D11DeviceContext* GetD3D11DeviceContext() override final { return m_pd3d11DeviceContext; }
-
- void CommitRenderTargets();
-
- /// Clears committed shader resource cache. This function
- /// is called once per frame (before present) to release all
- /// outstanding objects that are only kept alive by references
- /// in the cache. The function does not release cached vertex and
- /// index buffers, input layout, depth-stencil, rasterizer, and blend
- /// states.
- void ReleaseCommittedShaderResources();
-
- /// Unbinds all render targets. Used when resizing the swap chain.
- virtual void ResetRenderTargets() override final;
-
- /// Number of different shader types (Vertex, Pixel, Geometry, Domain, Hull, Compute)
- static constexpr int NumShaderTypes = 6;
-
-private:
- /// Commits d3d11 index buffer to d3d11 device context.
- void CommitD3D11IndexBuffer(VALUE_TYPE IndexType);
-
- /// Commits d3d11 vertex buffers to d3d11 device context.
- void CommitD3D11VertexBuffers(class PipelineStateD3D11Impl* pPipelineStateD3D11);
-
- /// Helper template function used to facilitate resource unbinding
- template <typename TD3D11ResourceViewType,
- typename TSetD3D11View,
- size_t NumSlots>
- void UnbindResourceView(TD3D11ResourceViewType CommittedD3D11ViewsArr[][NumSlots],
- ID3D11Resource* CommittedD3D11ResourcesArr[][NumSlots],
- Uint8 NumCommittedResourcesArr[],
- ID3D11Resource* pd3d11ResToUndind,
- TSetD3D11View SetD3D11ViewMethods[]);
-
- /// Unbinds a texture from shader resource view slots.
- /// \note The function only unbinds the texture from d3d11 device
- /// context. All shader bindings are retained.
- void UnbindTextureFromInput(TextureBaseD3D11* pTexture, ID3D11Resource* pd3d11Resource);
-
- /// Unbinds a buffer from input (shader resource views slots, index
- /// and vertex buffer slots).
- /// \note The function only unbinds the buffer from d3d11 device
- /// context. All shader bindings are retained.
- void UnbindBufferFromInput(BufferD3D11Impl* pBuffer, ID3D11Resource* pd3d11Buffer);
-
- /// Unbinds a resource from UAV slots.
- /// \note The function only unbinds the resource from d3d11 device
- /// context. All shader bindings are retained.
- void UnbindResourceFromUAV(IDeviceObject* pResource, ID3D11Resource* pd3d11Resource);
-
- /// Unbinds a texture from render target slots.
- void UnbindTextureFromRenderTarget(TextureBaseD3D11* pResource);
-
- /// Unbinds a texture from depth-stencil.
- void UnbindTextureFromDepthStencil(TextureBaseD3D11* pTexD3D11);
-
- /// Prepares for a draw command
- __forceinline void PrepareForDraw(DRAW_FLAGS Flags);
-
- /// Prepares for an indexed draw command
- __forceinline void PrepareForIndexedDraw(DRAW_FLAGS Flags, VALUE_TYPE IndexType);
-
-
- template <bool TransitionResources,
- bool CommitResources>
- void TransitionAndCommitShaderResources(IPipelineState* pPSO, IShaderResourceBinding* pShaderResourceBinding, bool VerifyStates);
-
- void ClearStateCache();
-
- CComPtr<ID3D11DeviceContext> m_pd3d11DeviceContext; ///< D3D11 device context
-
- // clang-format off
-
- /// An array of D3D11 constant buffers committed to D3D11 device context,
- /// for each shader type. The context addref's all bound resources, so we do
- /// not need to keep strong references.
- ID3D11Buffer* m_CommittedD3D11CBs [NumShaderTypes][D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT] = {};
-
- /// An array of D3D11 shader resource views committed to D3D11 device context,
- /// for each shader type. The context addref's all bound resources, so we do
- /// not need to keep strong references.
- ID3D11ShaderResourceView* m_CommittedD3D11SRVs [NumShaderTypes][D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT] = {};
-
- /// An array of D3D11 samplers committed to D3D11 device context,
- /// for each shader type. The context addref's all bound resources, so we do
- /// not need to keep strong references.
- ID3D11SamplerState* m_CommittedD3D11Samplers[NumShaderTypes][D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT] = {};
-
- /// An array of D3D11 UAVs committed to D3D11 device context,
- /// for each shader type. The context addref's all bound resources, so we do
- /// not need to keep strong references.
- ID3D11UnorderedAccessView* m_CommittedD3D11UAVs [NumShaderTypes][D3D11_PS_CS_UAV_REGISTER_COUNT] = {};
-
- /// An array of D3D11 resources commited as SRV to D3D11 device context,
- /// for each shader type. The context addref's all bound resources, so we do
- /// not need to keep strong references.
- ID3D11Resource* m_CommittedD3D11SRVResources [NumShaderTypes][D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT] = {};
-
- /// An array of D3D11 resources commited as UAV to D3D11 device context,
- /// for each shader type. The context addref's all bound resources, so we do
- /// not need to keep strong references.
- ID3D11Resource* m_CommittedD3D11UAVResources [NumShaderTypes][D3D11_PS_CS_UAV_REGISTER_COUNT] = {};
-
- Uint8 m_NumCommittedCBs [NumShaderTypes] = {};
- Uint8 m_NumCommittedSRVs [NumShaderTypes] = {};
- Uint8 m_NumCommittedSamplers[NumShaderTypes] = {};
- Uint8 m_NumCommittedUAVs [NumShaderTypes] = {};
-
- // clang-format on
-
- /// An array of D3D11 vertex buffers committed to D3D device context.
- /// There is no need to keep strong references because D3D11 device context
- /// already does. Buffers cannot be destroyed while bound to the context.
- /// We only mirror all bindings.
- ID3D11Buffer* m_CommittedD3D11VertexBuffers[MAX_BUFFER_SLOTS] = {};
- /// An array of strides of committed vertex buffers
- UINT m_CommittedD3D11VBStrides[MAX_BUFFER_SLOTS] = {};
- /// An array of offsets of committed vertex buffers
- UINT m_CommittedD3D11VBOffsets[MAX_BUFFER_SLOTS] = {};
- /// Number committed vertex buffers
- UINT m_NumCommittedD3D11VBs = 0;
- /// Flag indicating if currently committed D3D11 vertex buffers are up to date
- bool m_bCommittedD3D11VBsUpToDate = false;
-
- /// D3D11 input layout committed to device context.
- /// The context keeps the layout alive, so there is no need
- /// to keep strong reference.
- ID3D11InputLayout* m_CommittedD3D11InputLayout = nullptr;
-
- /// Strong reference to D3D11 buffer committed as index buffer
- /// to D3D device context.
- CComPtr<ID3D11Buffer> m_CommittedD3D11IndexBuffer;
- /// Format of the committed D3D11 index buffer
- VALUE_TYPE m_CommittedIBFormat = VT_UNDEFINED;
- /// Offset of the committed D3D11 index buffer
- Uint32 m_CommittedD3D11IndexDataStartOffset = 0;
- /// Flag indicating if currently committed D3D11 index buffer is up to date
- bool m_bCommittedD3D11IBUpToDate = false;
-
- D3D11_PRIMITIVE_TOPOLOGY m_CommittedD3D11PrimTopology = D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED;
- PRIMITIVE_TOPOLOGY m_CommittedPrimitiveTopology = PRIMITIVE_TOPOLOGY_UNDEFINED;
-
- /// Strong references to committed D3D11 shaders
- CComPtr<ID3D11DeviceChild> m_CommittedD3DShaders[NumShaderTypes];
-
- const Uint32 m_DebugFlags;
-
- FixedBlockMemoryAllocator m_CmdListAllocator;
-
- DisjointQueryPool m_DisjointQueryPool;
- std::shared_ptr<DisjointQueryPool::DisjointQueryWrapper> m_ActiveDisjointQuery;
-
-#ifdef VERIFY_CONTEXT_BINDINGS
-
- /// Helper template function used to facilitate context verification
- template <UINT MaxResources, typename TD3D11ResourceType, typename TGetD3D11ResourcesType>
- void dbgVerifyCommittedResources(TD3D11ResourceType CommittedD3D11ResourcesArr[][MaxResources],
- Uint8 NumCommittedResourcesArr[],
- TGetD3D11ResourcesType GetD3D11ResMethods[],
- const Char* ResourceName,
- SHADER_TYPE ShaderType);
-
- /// Helper template function used to facilitate validation of SRV and UAV consistency with D3D11 resources
- template <UINT MaxResources, typename TD3D11ViewType>
- void dbgVerifyViewConsistency(TD3D11ViewType CommittedD3D11ViewArr[][MaxResources],
- ID3D11Resource* CommittedD3D11ResourcesArr[][MaxResources],
- Uint8 NumCommittedResourcesArr[],
- const Char* ResourceName,
- SHADER_TYPE ShaderType);
-
- /// Debug function that verifies that SRVs cached in m_CommittedD3D11SRVs
- /// array comply with resources actually committed to D3D11 device context
- void dbgVerifyCommittedSRVs(SHADER_TYPE ShaderType = SHADER_TYPE_UNKNOWN);
-
- /// Debug function that verifies that UAVs cached in m_CommittedD3D11UAVs
- /// array comply with resources actually committed to D3D11 device context
- void dbgVerifyCommittedUAVs(SHADER_TYPE ShaderType = SHADER_TYPE_UNKNOWN);
-
- /// Debug function that verifies that samplers cached in m_CommittedD3D11Samplers
- /// array comply with resources actually committed to D3D11 device context
- void dbgVerifyCommittedSamplers(SHADER_TYPE ShaderType = SHADER_TYPE_UNKNOWN);
-
- /// Debug function that verifies that constant buffers cached in m_CommittedD3D11CBs
- /// array comply with buffers actually committed to D3D11 device context
- void dbgVerifyCommittedCBs(SHADER_TYPE ShaderType = SHADER_TYPE_UNKNOWN);
-
- /// Debug function that verifies that index buffer cached in
- /// m_CommittedD3D11IndexBuffer is the buffer actually committed to D3D11
- /// device context
- void dbgVerifyCommittedIndexBuffer();
-
- /// Debug function that verifies that vertex buffers cached in
- /// m_CommittedD3D11VertexBuffers are the buffers actually committed to D3D11
- /// device context
- void dbgVerifyCommittedVertexBuffers();
-
- /// Debug function that verifies that shaders cached in
- /// m_CommittedD3DShaders are the shaders actually committed to D3D11
- /// device context
- void dbgVerifyCommittedShaders();
-
-#else
-# define dbgVerifyRenderTargetFormats(...)
-# define dbgVerifyCommittedSRVs(...)
-# define dbgVerifyCommittedUAVs(...)
-# define dbgVerifyCommittedSamplers(...)
-# define dbgVerifyCommittedCBs(...)
-# define dbgVerifyCommittedIndexBuffer(...)
-# define dbgVerifyCommittedVertexBuffers(...)
-# define dbgVerifyCommittedShaders(...)
-#endif // VERIFY_CONTEXT_BINDINGS
-};
-
-} // namespace Diligent
+/* + * Copyright 2019-2020 Diligent Graphics LLC + * Copyright 2015-2019 Egor Yusov + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#pragma once + +/// \file +/// Declaration of Diligent::DeviceContextD3D11Impl class + +#include "DeviceContextD3D11.h" +#include "DeviceContextBase.hpp" +#include "ShaderD3D11Impl.hpp" +#include "BufferD3D11Impl.hpp" +#include "TextureBaseD3D11.hpp" +#include "PipelineStateD3D11Impl.hpp" +#include "QueryD3D11Impl.hpp" +#include "DisjointQueryPool.hpp" + +#ifdef _DEBUG +# define VERIFY_CONTEXT_BINDINGS +#endif + +namespace Diligent +{ + +class RenderDeviceD3D11Impl; + +struct DeviceContextD3D11ImplTraits +{ + using BufferType = BufferD3D11Impl; + using TextureType = TextureBaseD3D11; + using PipelineStateType = PipelineStateD3D11Impl; + using DeviceType = RenderDeviceD3D11Impl; + using QueryType = QueryD3D11Impl; +}; + +/// Device context implementation in Direct3D11 backend. +class DeviceContextD3D11Impl final : public DeviceContextBase<IDeviceContextD3D11, DeviceContextD3D11ImplTraits> +{ +public: + using TDeviceContextBase = DeviceContextBase<IDeviceContextD3D11, DeviceContextD3D11ImplTraits>; + + DeviceContextD3D11Impl(IReferenceCounters* pRefCounters, + IMemoryAllocator& Allocator, + RenderDeviceD3D11Impl* pDevice, + ID3D11DeviceContext* pd3d11DeviceContext, + const struct EngineD3D11CreateInfo& EngineAttribs, + bool bIsDeferred); + virtual void QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override final; + + /// Implementation of IDeviceContext::SetPipelineState() in Direct3D11 backend. + virtual void SetPipelineState(IPipelineState* pPipelineState) override final; + + /// Implementation of IDeviceContext::TransitionShaderResources() in Direct3D11 backend. + virtual void TransitionShaderResources(IPipelineState* pPipelineState, IShaderResourceBinding* pShaderResourceBinding) override final; + + /// Implementation of IDeviceContext::CommitShaderResources() in Direct3D11 backend. + virtual void CommitShaderResources(IShaderResourceBinding* pShaderResourceBinding, RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final; + + /// Implementation of IDeviceContext::SetStencilRef() in Direct3D11 backend. + virtual void SetStencilRef(Uint32 StencilRef) override final; + + /// Implementation of IDeviceContext::SetBlendFactors() in Direct3D11 backend. + virtual void SetBlendFactors(const float* pBlendFactors = nullptr) override final; + + /// Implementation of IDeviceContext::SetVertexBuffers() in Direct3D11 backend. + virtual void SetVertexBuffers(Uint32 StartSlot, + Uint32 NumBuffersSet, + IBuffer** ppBuffers, + Uint32* pOffsets, + RESOURCE_STATE_TRANSITION_MODE StateTransitionMode, + SET_VERTEX_BUFFERS_FLAGS Flags) override final; + + /// Implementation of IDeviceContext::InvalidateState() in Direct3D11 backend. + virtual void InvalidateState() override final; + + /// Implementation of IDeviceContext::SetIndexBuffer() in Direct3D11 backend. + virtual void SetIndexBuffer(IBuffer* pIndexBuffer, Uint32 ByteOffset, RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final; + + /// Implementation of IDeviceContext::SetViewports() in Direct3D11 backend. + virtual void SetViewports(Uint32 NumViewports, const Viewport* pViewports, Uint32 RTWidth, Uint32 RTHeight) override final; + + /// Implementation of IDeviceContext::SetScissorRects() in Direct3D11 backend. + virtual void SetScissorRects(Uint32 NumRects, const Rect* pRects, Uint32 RTWidth, Uint32 RTHeight) override final; + + /// Implementation of IDeviceContext::SetRenderTargets() in Direct3D11 backend. + virtual void SetRenderTargets(Uint32 NumRenderTargets, + ITextureView* ppRenderTargets[], + ITextureView* pDepthStencil, + RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final; + + /// Implementation of IDeviceContext::Draw() in Direct3D11 backend. + virtual void Draw(const DrawAttribs& Attribs) override final; + /// Implementation of IDeviceContext::DrawIndexed() in Direct3D11 backend. + virtual void DrawIndexed(const DrawIndexedAttribs& Attribs) override final; + /// Implementation of IDeviceContext::DrawIndirect() in Direct3D11 backend. + virtual void DrawIndirect(const DrawIndirectAttribs& Attribs, IBuffer* pAttribsBuffer) override final; + /// Implementation of IDeviceContext::DrawIndexedIndirect() in Direct3D11 backend. + virtual void DrawIndexedIndirect(const DrawIndexedIndirectAttribs& Attribs, IBuffer* pAttribsBuffer) override final; + + /// Implementation of IDeviceContext::DispatchCompute() in Direct3D11 backend. + virtual void DispatchCompute(const DispatchComputeAttribs& Attribs) override final; + /// Implementation of IDeviceContext::DispatchComputeIndirect() in Direct3D11 backend. + virtual void DispatchComputeIndirect(const DispatchComputeIndirectAttribs& Attribs, IBuffer* pAttribsBuffer) override final; + + /// Implementation of IDeviceContext::ClearDepthStencil() in Direct3D11 backend. + virtual void ClearDepthStencil(ITextureView* pView, + CLEAR_DEPTH_STENCIL_FLAGS ClearFlags, + float fDepth, + Uint8 Stencil, + RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final; + + /// Implementation of IDeviceContext::ClearRenderTarget() in Direct3D11 backend. + virtual void ClearRenderTarget(ITextureView* pView, const float* RGBA, RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final; + + /// Implementation of IDeviceContext::UpdateBuffer() in Direct3D11 backend. + virtual void UpdateBuffer(IBuffer* pBuffer, + Uint32 Offset, + Uint32 Size, + const void* pData, + RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final; + + /// Implementation of IDeviceContext::CopyBuffer() in Direct3D11 backend. + virtual void CopyBuffer(IBuffer* pSrcBuffer, + Uint32 SrcOffset, + RESOURCE_STATE_TRANSITION_MODE SrcBufferTransitionMode, + IBuffer* pDstBuffer, + Uint32 DstOffset, + Uint32 Size, + RESOURCE_STATE_TRANSITION_MODE DstBufferTransitionMode) override final; + + /// Implementation of IDeviceContext::MapBuffer() in Direct3D11 backend. + virtual void MapBuffer(IBuffer* pBuffer, MAP_TYPE MapType, MAP_FLAGS MapFlags, PVoid& pMappedData) override final; + + /// Implementation of IDeviceContext::UnmapBuffer() in Direct3D11 backend. + virtual void UnmapBuffer(IBuffer* pBuffer, MAP_TYPE MapType) override final; + + /// Implementation of IDeviceContext::UpdateTexture() in Direct3D11 backend. + virtual void UpdateTexture(ITexture* pTexture, + Uint32 MipLevel, + Uint32 Slice, + const Box& DstBox, + const TextureSubResData& SubresData, + RESOURCE_STATE_TRANSITION_MODE SrcBufferTransitionMode, + RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final; + + /// Implementation of IDeviceContext::CopyTexture() in Direct3D11 backend. + virtual void CopyTexture(const CopyTextureAttribs& CopyAttribs) override final; + + /// Implementation of IDeviceContext::MapTextureSubresource() in Direct3D11 backend. + virtual void MapTextureSubresource(ITexture* pTexture, + Uint32 MipLevel, + Uint32 ArraySlice, + MAP_TYPE MapType, + MAP_FLAGS MapFlags, + const Box* pMapRegion, + MappedTextureSubresource& MappedData) override final; + + /// Implementation of IDeviceContext::UnmapTextureSubresource() in Direct3D11 backend. + virtual void UnmapTextureSubresource(ITexture* pTexture, Uint32 MipLevel, Uint32 ArraySlice) override final; + + /// Implementation of IDeviceContext::GenerateMips() in Direct3D11 backend. + virtual void GenerateMips(ITextureView* pTextureView) override final; + + /// Implementation of IDeviceContext::FinishFrame() in Direct3D11 backend. + virtual void FinishFrame() override final; + + /// Implementation of IDeviceContext::TransitionResourceStates() in Direct3D11 backend. + virtual void TransitionResourceStates(Uint32 BarrierCount, StateTransitionDesc* pResourceBarriers) override final; + + /// Implementation of IDeviceContext::ResolveTextureSubresource() in Direct3D11 backend. + virtual void ResolveTextureSubresource(ITexture* pSrcTexture, + ITexture* pDstTexture, + const ResolveTextureSubresourceAttribs& ResolveAttribs) override final; + + /// Implementation of IDeviceContext::FinishCommandList() in Direct3D11 backend. + void FinishCommandList(class ICommandList** ppCommandList) override final; + + /// Implementation of IDeviceContext::ExecuteCommandList() in Direct3D11 backend. + virtual void ExecuteCommandList(class ICommandList* pCommandList) override final; + + /// Implementation of IDeviceContext::SignalFence() in Direct3D11 backend. + virtual void SignalFence(IFence* pFence, Uint64 Value) override final; + + /// Implementation of IDeviceContext::WaitForFence() in Direct3D11 backend. + virtual void WaitForFence(IFence* pFence, Uint64 Value, bool FlushContext) override final; + + /// Implementation of IDeviceContext::WaitForIdle() in Direct3D11 backend. + virtual void WaitForIdle() override final; + + /// Implementation of IDeviceContext::BeginQuery() in Direct3D11 backend. + virtual void BeginQuery(IQuery* pQuery) override final; + + /// Implementation of IDeviceContext::EndQuery() in Direct3D11 backend. + virtual void EndQuery(IQuery* pQuery) override final; + + /// Implementation of IDeviceContext::Flush() in Direct3D11 backend. + virtual void Flush() override final; + + /// Implementation of IDeviceContextD3D11::GetD3D11DeviceContext(). + virtual ID3D11DeviceContext* GetD3D11DeviceContext() override final { return m_pd3d11DeviceContext; } + + void CommitRenderTargets(); + + /// Clears committed shader resource cache. This function + /// is called once per frame (before present) to release all + /// outstanding objects that are only kept alive by references + /// in the cache. The function does not release cached vertex and + /// index buffers, input layout, depth-stencil, rasterizer, and blend + /// states. + void ReleaseCommittedShaderResources(); + + /// Unbinds all render targets. Used when resizing the swap chain. + virtual void ResetRenderTargets() override final; + + /// Number of different shader types (Vertex, Pixel, Geometry, Domain, Hull, Compute) + static constexpr int NumShaderTypes = 6; + +private: + /// Commits d3d11 index buffer to d3d11 device context. + void CommitD3D11IndexBuffer(VALUE_TYPE IndexType); + + /// Commits d3d11 vertex buffers to d3d11 device context. + void CommitD3D11VertexBuffers(class PipelineStateD3D11Impl* pPipelineStateD3D11); + + /// Helper template function used to facilitate resource unbinding + template <typename TD3D11ResourceViewType, + typename TSetD3D11View, + size_t NumSlots> + void UnbindResourceView(TD3D11ResourceViewType CommittedD3D11ViewsArr[][NumSlots], + ID3D11Resource* CommittedD3D11ResourcesArr[][NumSlots], + Uint8 NumCommittedResourcesArr[], + ID3D11Resource* pd3d11ResToUndind, + TSetD3D11View SetD3D11ViewMethods[]); + + /// Unbinds a texture from shader resource view slots. + /// \note The function only unbinds the texture from d3d11 device + /// context. All shader bindings are retained. + void UnbindTextureFromInput(TextureBaseD3D11* pTexture, ID3D11Resource* pd3d11Resource); + + /// Unbinds a buffer from input (shader resource views slots, index + /// and vertex buffer slots). + /// \note The function only unbinds the buffer from d3d11 device + /// context. All shader bindings are retained. + void UnbindBufferFromInput(BufferD3D11Impl* pBuffer, ID3D11Resource* pd3d11Buffer); + + /// Unbinds a resource from UAV slots. + /// \note The function only unbinds the resource from d3d11 device + /// context. All shader bindings are retained. + void UnbindResourceFromUAV(IDeviceObject* pResource, ID3D11Resource* pd3d11Resource); + + /// Unbinds a texture from render target slots. + void UnbindTextureFromRenderTarget(TextureBaseD3D11* pResource); + + /// Unbinds a texture from depth-stencil. + void UnbindTextureFromDepthStencil(TextureBaseD3D11* pTexD3D11); + + /// Prepares for a draw command + __forceinline void PrepareForDraw(DRAW_FLAGS Flags); + + /// Prepares for an indexed draw command + __forceinline void PrepareForIndexedDraw(DRAW_FLAGS Flags, VALUE_TYPE IndexType); + + + template <bool TransitionResources, + bool CommitResources> + void TransitionAndCommitShaderResources(IPipelineState* pPSO, IShaderResourceBinding* pShaderResourceBinding, bool VerifyStates); + + void ClearStateCache(); + + CComPtr<ID3D11DeviceContext> m_pd3d11DeviceContext; ///< D3D11 device context + + // clang-format off + + /// An array of D3D11 constant buffers committed to D3D11 device context, + /// for each shader type. The context addref's all bound resources, so we do + /// not need to keep strong references. + ID3D11Buffer* m_CommittedD3D11CBs [NumShaderTypes][D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT] = {}; + + /// An array of D3D11 shader resource views committed to D3D11 device context, + /// for each shader type. The context addref's all bound resources, so we do + /// not need to keep strong references. + ID3D11ShaderResourceView* m_CommittedD3D11SRVs [NumShaderTypes][D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT] = {}; + + /// An array of D3D11 samplers committed to D3D11 device context, + /// for each shader type. The context addref's all bound resources, so we do + /// not need to keep strong references. + ID3D11SamplerState* m_CommittedD3D11Samplers[NumShaderTypes][D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT] = {}; + + /// An array of D3D11 UAVs committed to D3D11 device context, + /// for each shader type. The context addref's all bound resources, so we do + /// not need to keep strong references. + ID3D11UnorderedAccessView* m_CommittedD3D11UAVs [NumShaderTypes][D3D11_PS_CS_UAV_REGISTER_COUNT] = {}; + + /// An array of D3D11 resources commited as SRV to D3D11 device context, + /// for each shader type. The context addref's all bound resources, so we do + /// not need to keep strong references. + ID3D11Resource* m_CommittedD3D11SRVResources [NumShaderTypes][D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT] = {}; + + /// An array of D3D11 resources commited as UAV to D3D11 device context, + /// for each shader type. The context addref's all bound resources, so we do + /// not need to keep strong references. + ID3D11Resource* m_CommittedD3D11UAVResources [NumShaderTypes][D3D11_PS_CS_UAV_REGISTER_COUNT] = {}; + + Uint8 m_NumCommittedCBs [NumShaderTypes] = {}; + Uint8 m_NumCommittedSRVs [NumShaderTypes] = {}; + Uint8 m_NumCommittedSamplers[NumShaderTypes] = {}; + Uint8 m_NumCommittedUAVs [NumShaderTypes] = {}; + + // clang-format on + + /// An array of D3D11 vertex buffers committed to D3D device context. + /// There is no need to keep strong references because D3D11 device context + /// already does. Buffers cannot be destroyed while bound to the context. + /// We only mirror all bindings. + ID3D11Buffer* m_CommittedD3D11VertexBuffers[MAX_BUFFER_SLOTS] = {}; + /// An array of strides of committed vertex buffers + UINT m_CommittedD3D11VBStrides[MAX_BUFFER_SLOTS] = {}; + /// An array of offsets of committed vertex buffers + UINT m_CommittedD3D11VBOffsets[MAX_BUFFER_SLOTS] = {}; + /// Number committed vertex buffers + UINT m_NumCommittedD3D11VBs = 0; + /// Flag indicating if currently committed D3D11 vertex buffers are up to date + bool m_bCommittedD3D11VBsUpToDate = false; + + /// D3D11 input layout committed to device context. + /// The context keeps the layout alive, so there is no need + /// to keep strong reference. + ID3D11InputLayout* m_CommittedD3D11InputLayout = nullptr; + + /// Strong reference to D3D11 buffer committed as index buffer + /// to D3D device context. + CComPtr<ID3D11Buffer> m_CommittedD3D11IndexBuffer; + /// Format of the committed D3D11 index buffer + VALUE_TYPE m_CommittedIBFormat = VT_UNDEFINED; + /// Offset of the committed D3D11 index buffer + Uint32 m_CommittedD3D11IndexDataStartOffset = 0; + /// Flag indicating if currently committed D3D11 index buffer is up to date + bool m_bCommittedD3D11IBUpToDate = false; + + D3D11_PRIMITIVE_TOPOLOGY m_CommittedD3D11PrimTopology = D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED; + PRIMITIVE_TOPOLOGY m_CommittedPrimitiveTopology = PRIMITIVE_TOPOLOGY_UNDEFINED; + + /// Strong references to committed D3D11 shaders + CComPtr<ID3D11DeviceChild> m_CommittedD3DShaders[NumShaderTypes]; + + const Uint32 m_DebugFlags; + + FixedBlockMemoryAllocator m_CmdListAllocator; + + DisjointQueryPool m_DisjointQueryPool; + std::shared_ptr<DisjointQueryPool::DisjointQueryWrapper> m_ActiveDisjointQuery; + +#ifdef VERIFY_CONTEXT_BINDINGS + + /// Helper template function used to facilitate context verification + template <UINT MaxResources, typename TD3D11ResourceType, typename TGetD3D11ResourcesType> + void dbgVerifyCommittedResources(TD3D11ResourceType CommittedD3D11ResourcesArr[][MaxResources], + Uint8 NumCommittedResourcesArr[], + TGetD3D11ResourcesType GetD3D11ResMethods[], + const Char* ResourceName, + SHADER_TYPE ShaderType); + + /// Helper template function used to facilitate validation of SRV and UAV consistency with D3D11 resources + template <UINT MaxResources, typename TD3D11ViewType> + void dbgVerifyViewConsistency(TD3D11ViewType CommittedD3D11ViewArr[][MaxResources], + ID3D11Resource* CommittedD3D11ResourcesArr[][MaxResources], + Uint8 NumCommittedResourcesArr[], + const Char* ResourceName, + SHADER_TYPE ShaderType); + + /// Debug function that verifies that SRVs cached in m_CommittedD3D11SRVs + /// array comply with resources actually committed to D3D11 device context + void dbgVerifyCommittedSRVs(SHADER_TYPE ShaderType = SHADER_TYPE_UNKNOWN); + + /// Debug function that verifies that UAVs cached in m_CommittedD3D11UAVs + /// array comply with resources actually committed to D3D11 device context + void dbgVerifyCommittedUAVs(SHADER_TYPE ShaderType = SHADER_TYPE_UNKNOWN); + + /// Debug function that verifies that samplers cached in m_CommittedD3D11Samplers + /// array comply with resources actually committed to D3D11 device context + void dbgVerifyCommittedSamplers(SHADER_TYPE ShaderType = SHADER_TYPE_UNKNOWN); + + /// Debug function that verifies that constant buffers cached in m_CommittedD3D11CBs + /// array comply with buffers actually committed to D3D11 device context + void dbgVerifyCommittedCBs(SHADER_TYPE ShaderType = SHADER_TYPE_UNKNOWN); + + /// Debug function that verifies that index buffer cached in + /// m_CommittedD3D11IndexBuffer is the buffer actually committed to D3D11 + /// device context + void dbgVerifyCommittedIndexBuffer(); + + /// Debug function that verifies that vertex buffers cached in + /// m_CommittedD3D11VertexBuffers are the buffers actually committed to D3D11 + /// device context + void dbgVerifyCommittedVertexBuffers(); + + /// Debug function that verifies that shaders cached in + /// m_CommittedD3DShaders are the shaders actually committed to D3D11 + /// device context + void dbgVerifyCommittedShaders(); + +#else +# define dbgVerifyRenderTargetFormats(...) +# define dbgVerifyCommittedSRVs(...) +# define dbgVerifyCommittedUAVs(...) +# define dbgVerifyCommittedSamplers(...) +# define dbgVerifyCommittedCBs(...) +# define dbgVerifyCommittedIndexBuffer(...) +# define dbgVerifyCommittedVertexBuffers(...) +# define dbgVerifyCommittedShaders(...) +#endif // VERIFY_CONTEXT_BINDINGS +}; + +} // namespace Diligent diff --git a/Graphics/GraphicsEngineD3D11/include/DisjointQueryPool.h b/Graphics/GraphicsEngineD3D11/include/DisjointQueryPool.hpp index c9d259ab..c9d259ab 100644 --- a/Graphics/GraphicsEngineD3D11/include/DisjointQueryPool.h +++ b/Graphics/GraphicsEngineD3D11/include/DisjointQueryPool.hpp diff --git a/Graphics/GraphicsEngineD3D11/include/FenceD3D11Impl.h b/Graphics/GraphicsEngineD3D11/include/FenceD3D11Impl.hpp index e4f923de..3b08400a 100644 --- a/Graphics/GraphicsEngineD3D11/include/FenceD3D11Impl.h +++ b/Graphics/GraphicsEngineD3D11/include/FenceD3D11Impl.hpp @@ -33,8 +33,8 @@ #include <deque> #include "FenceD3D11.h" #include "RenderDeviceD3D11.h" -#include "FenceBase.h" -#include "RenderDeviceD3D11Impl.h" +#include "FenceBase.hpp" +#include "RenderDeviceD3D11Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/include/PipelineStateD3D11Impl.h b/Graphics/GraphicsEngineD3D11/include/PipelineStateD3D11Impl.hpp index 0a2c9805..59c7b0e8 100644 --- a/Graphics/GraphicsEngineD3D11/include/PipelineStateD3D11Impl.h +++ b/Graphics/GraphicsEngineD3D11/include/PipelineStateD3D11Impl.hpp @@ -32,10 +32,10 @@ #include "PipelineStateD3D11.h" #include "RenderDeviceD3D11.h" -#include "PipelineStateBase.h" -#include "ShaderD3D11Impl.h" +#include "PipelineStateBase.hpp" +#include "ShaderD3D11Impl.hpp" #include "SRBMemoryAllocator.hpp" -#include "RenderDeviceD3D11Impl.h" +#include "RenderDeviceD3D11Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/include/QueryD3D11Impl.h b/Graphics/GraphicsEngineD3D11/include/QueryD3D11Impl.hpp index c8611ec0..c95ddcd9 100644 --- a/Graphics/GraphicsEngineD3D11/include/QueryD3D11Impl.h +++ b/Graphics/GraphicsEngineD3D11/include/QueryD3D11Impl.hpp @@ -33,9 +33,9 @@ #include <memory> #include "QueryD3D11.h" -#include "QueryBase.h" -#include "RenderDeviceD3D11Impl.h" -#include "DisjointQueryPool.h" +#include "QueryBase.hpp" +#include "RenderDeviceD3D11Impl.hpp" +#include "DisjointQueryPool.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/include/RenderDeviceD3D11Impl.h b/Graphics/GraphicsEngineD3D11/include/RenderDeviceD3D11Impl.hpp index 17285244..2c23841c 100644 --- a/Graphics/GraphicsEngineD3D11/include/RenderDeviceD3D11Impl.h +++ b/Graphics/GraphicsEngineD3D11/include/RenderDeviceD3D11Impl.hpp @@ -31,7 +31,7 @@ /// Declaration of Diligent::RenderDeviceD3D11Impl class #include "RenderDeviceD3D11.h" -#include "RenderDeviceD3DBase.h" +#include "RenderDeviceD3DBase.hpp" #include "DeviceContextD3D11.h" namespace Diligent diff --git a/Graphics/GraphicsEngineD3D11/include/SamplerD3D11Impl.h b/Graphics/GraphicsEngineD3D11/include/SamplerD3D11Impl.hpp index 6d5d8936..6ad866f0 100644 --- a/Graphics/GraphicsEngineD3D11/include/SamplerD3D11Impl.h +++ b/Graphics/GraphicsEngineD3D11/include/SamplerD3D11Impl.hpp @@ -32,8 +32,8 @@ #include "SamplerD3D11.h" #include "RenderDeviceD3D11.h" -#include "SamplerBase.h" -#include "RenderDeviceD3D11Impl.h" +#include "SamplerBase.hpp" +#include "RenderDeviceD3D11Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/include/ShaderD3D11Impl.h b/Graphics/GraphicsEngineD3D11/include/ShaderD3D11Impl.hpp index aaaae904..214bedca 100644 --- a/Graphics/GraphicsEngineD3D11/include/ShaderD3D11Impl.h +++ b/Graphics/GraphicsEngineD3D11/include/ShaderD3D11Impl.hpp @@ -32,13 +32,13 @@ #include "ShaderD3D11.h" #include "RenderDeviceD3D11.h" -#include "ShaderBase.h" -#include "ShaderD3DBase.h" -#include "ShaderResourceLayoutD3D11.h" -#include "ShaderResourceCacheD3D11.h" +#include "ShaderBase.hpp" +#include "ShaderD3DBase.hpp" +#include "ShaderResourceLayoutD3D11.hpp" +#include "ShaderResourceCacheD3D11.hpp" #include "EngineD3D11Defines.h" -#include "ShaderResourcesD3D11.h" -#include "RenderDeviceD3D11Impl.h" +#include "ShaderResourcesD3D11.hpp" +#include "RenderDeviceD3D11Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/include/ShaderResourceBindingD3D11Impl.h b/Graphics/GraphicsEngineD3D11/include/ShaderResourceBindingD3D11Impl.hpp index bc14042d..55a6ca2d 100755..100644 --- a/Graphics/GraphicsEngineD3D11/include/ShaderResourceBindingD3D11Impl.h +++ b/Graphics/GraphicsEngineD3D11/include/ShaderResourceBindingD3D11Impl.hpp @@ -1,108 +1,108 @@ -/*
- * Copyright 2019-2020 Diligent Graphics LLC
- * Copyright 2015-2019 Egor Yusov
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * In no event and under no legal theory, whether in tort (including negligence),
- * contract, or otherwise, unless required by applicable law (such as deliberate
- * and grossly negligent acts) or agreed to in writing, shall any Contributor be
- * liable for any damages, including any direct, indirect, special, incidental,
- * or consequential damages of any character arising as a result of this License or
- * out of the use or inability to use the software (including but not limited to damages
- * for loss of goodwill, work stoppage, computer failure or malfunction, or any and
- * all other commercial damages or losses), even if such Contributor has been advised
- * of the possibility of such damages.
- */
-
-#pragma once
-
-/// \file
-/// Declaration of Diligent::ShaderResourceBindingD3D11Impl class
-
-#include "ShaderResourceBindingD3D11.h"
-#include "RenderDeviceD3D11.h"
-#include "ShaderResourceBindingBase.h"
-#include "ShaderResourceCacheD3D11.h"
-#include "ShaderResourceLayoutD3D11.h"
-#include "STDAllocator.h"
-
-namespace Diligent
-{
-
-class FixedBlockMemoryAllocator;
-
-/// Implementation of shader resource binding object in Direct3D11 backend.
-class ShaderResourceBindingD3D11Impl final : public ShaderResourceBindingBase<IShaderResourceBindingD3D11>
-{
-public:
- using TBase = ShaderResourceBindingBase<IShaderResourceBindingD3D11>;
-
- ShaderResourceBindingD3D11Impl(IReferenceCounters* pRefCounters,
- class PipelineStateD3D11Impl* pPSO,
- bool IsInternal);
- ~ShaderResourceBindingD3D11Impl();
-
- virtual void QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override final;
-
- /// Implementation of IShaderResourceBinding::BindResources() in Direct3D11 backend.
- virtual void BindResources(Uint32 ShaderFlags, IResourceMapping* pResMapping, Uint32 Flags) override final;
-
- /// Implementation of IShaderResourceBinding::GetVariableByName() in Direct3D11 backend.
- virtual IShaderResourceVariable* GetVariableByName(SHADER_TYPE ShaderType, const char* Name) override final;
-
- /// Implementation of IShaderResourceBinding::GetVariableCount() in Direct3D11 backend.
- virtual Uint32 GetVariableCount(SHADER_TYPE ShaderType) const override final;
-
- /// Implementation of IShaderResourceBinding::GetVariableByIndex() in Direct3D11 backend.
- virtual IShaderResourceVariable* GetVariableByIndex(SHADER_TYPE ShaderType, Uint32 Index) override final;
-
- /// Implementation of IShaderResourceBinding::InitializeStaticResources() in Direct3D11 backend.
- virtual void InitializeStaticResources(const IPipelineState* pPipelineState) override final;
-
- ShaderResourceCacheD3D11& GetResourceCache(Uint32 Ind)
- {
- VERIFY_EXPR(Ind < m_NumActiveShaders);
- return m_pBoundResourceCaches[Ind];
- }
-
- ShaderResourceLayoutD3D11& GetResourceLayout(Uint32 Ind)
- {
- VERIFY_EXPR(Ind < m_NumActiveShaders);
- return m_pResourceLayouts[Ind];
- }
-
- inline bool IsStaticResourcesBound() { return m_bIsStaticResourcesBound; }
-
- Uint32 GetNumActiveShaders()
- {
- return static_cast<Uint32>(m_NumActiveShaders);
- }
-
- Int32 GetActiveShaderTypeIndex(Uint32 s) { return m_ShaderTypeIndex[s]; }
-
-private:
- // The caches are indexed by the shader order in the PSO, not shader index
- ShaderResourceCacheD3D11* m_pBoundResourceCaches = nullptr;
- ShaderResourceLayoutD3D11* m_pResourceLayouts = nullptr;
-
- Int8 m_ShaderTypeIndex[6] = {};
-
- // Resource layout index in m_ResourceLayouts[] array for every shader stage
- Int8 m_ResourceLayoutIndex[6] = {-1, -1, -1, -1, -1, -1};
- Uint8 m_NumActiveShaders = 0;
-
- bool m_bIsStaticResourcesBound = false;
-};
-
-} // namespace Diligent
+/* + * Copyright 2019-2020 Diligent Graphics LLC + * Copyright 2015-2019 Egor Yusov + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#pragma once + +/// \file +/// Declaration of Diligent::ShaderResourceBindingD3D11Impl class + +#include "ShaderResourceBindingD3D11.h" +#include "RenderDeviceD3D11.h" +#include "ShaderResourceBindingBase.hpp" +#include "ShaderResourceCacheD3D11.hpp" +#include "ShaderResourceLayoutD3D11.hpp" +#include "STDAllocator.h" + +namespace Diligent +{ + +class FixedBlockMemoryAllocator; + +/// Implementation of shader resource binding object in Direct3D11 backend. +class ShaderResourceBindingD3D11Impl final : public ShaderResourceBindingBase<IShaderResourceBindingD3D11> +{ +public: + using TBase = ShaderResourceBindingBase<IShaderResourceBindingD3D11>; + + ShaderResourceBindingD3D11Impl(IReferenceCounters* pRefCounters, + class PipelineStateD3D11Impl* pPSO, + bool IsInternal); + ~ShaderResourceBindingD3D11Impl(); + + virtual void QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override final; + + /// Implementation of IShaderResourceBinding::BindResources() in Direct3D11 backend. + virtual void BindResources(Uint32 ShaderFlags, IResourceMapping* pResMapping, Uint32 Flags) override final; + + /// Implementation of IShaderResourceBinding::GetVariableByName() in Direct3D11 backend. + virtual IShaderResourceVariable* GetVariableByName(SHADER_TYPE ShaderType, const char* Name) override final; + + /// Implementation of IShaderResourceBinding::GetVariableCount() in Direct3D11 backend. + virtual Uint32 GetVariableCount(SHADER_TYPE ShaderType) const override final; + + /// Implementation of IShaderResourceBinding::GetVariableByIndex() in Direct3D11 backend. + virtual IShaderResourceVariable* GetVariableByIndex(SHADER_TYPE ShaderType, Uint32 Index) override final; + + /// Implementation of IShaderResourceBinding::InitializeStaticResources() in Direct3D11 backend. + virtual void InitializeStaticResources(const IPipelineState* pPipelineState) override final; + + ShaderResourceCacheD3D11& GetResourceCache(Uint32 Ind) + { + VERIFY_EXPR(Ind < m_NumActiveShaders); + return m_pBoundResourceCaches[Ind]; + } + + ShaderResourceLayoutD3D11& GetResourceLayout(Uint32 Ind) + { + VERIFY_EXPR(Ind < m_NumActiveShaders); + return m_pResourceLayouts[Ind]; + } + + inline bool IsStaticResourcesBound() { return m_bIsStaticResourcesBound; } + + Uint32 GetNumActiveShaders() + { + return static_cast<Uint32>(m_NumActiveShaders); + } + + Int32 GetActiveShaderTypeIndex(Uint32 s) { return m_ShaderTypeIndex[s]; } + +private: + // The caches are indexed by the shader order in the PSO, not shader index + ShaderResourceCacheD3D11* m_pBoundResourceCaches = nullptr; + ShaderResourceLayoutD3D11* m_pResourceLayouts = nullptr; + + Int8 m_ShaderTypeIndex[6] = {}; + + // Resource layout index in m_ResourceLayouts[] array for every shader stage + Int8 m_ResourceLayoutIndex[6] = {-1, -1, -1, -1, -1, -1}; + Uint8 m_NumActiveShaders = 0; + + bool m_bIsStaticResourcesBound = false; +}; + +} // namespace Diligent diff --git a/Graphics/GraphicsEngineD3D11/include/ShaderResourceCacheD3D11.h b/Graphics/GraphicsEngineD3D11/include/ShaderResourceCacheD3D11.hpp index 2623b5c3..ef18f9f0 100755..100644 --- a/Graphics/GraphicsEngineD3D11/include/ShaderResourceCacheD3D11.h +++ b/Graphics/GraphicsEngineD3D11/include/ShaderResourceCacheD3D11.hpp @@ -1,334 +1,334 @@ -/*
- * Copyright 2019-2020 Diligent Graphics LLC
- * Copyright 2015-2019 Egor Yusov
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * In no event and under no legal theory, whether in tort (including negligence),
- * contract, or otherwise, unless required by applicable law (such as deliberate
- * and grossly negligent acts) or agreed to in writing, shall any Contributor be
- * liable for any damages, including any direct, indirect, special, incidental,
- * or consequential damages of any character arising as a result of this License or
- * out of the use or inability to use the software (including but not limited to damages
- * for loss of goodwill, work stoppage, computer failure or malfunction, or any and
- * all other commercial damages or losses), even if such Contributor has been advised
- * of the possibility of such damages.
- */
-
-#pragma once
-
-/// \file
-/// Declaration of Diligent::ShaderResourceCacheD3D11 class
-
-#include "TextureBaseD3D11.h"
-#include "BufferD3D11Impl.h"
-#include "SamplerD3D11Impl.h"
-
-namespace Diligent
-{
-
-/// The class implements a cache that holds resources bound to a specific shader stage
-// All resources are stored in the continuous memory using the following layout:
-//
-// | CachedCB | ID3D11Buffer* || CachedResource | ID3D11ShaderResourceView* || CachedSampler | ID3D11SamplerState* || CachedResource | ID3D11UnorderedAccessView*||
-// |---------------------------------------------------||--------------------------|---------------------------||------------------------------|-----------------------------||-------------------------|---------------------------||
-// | 0 | 1 | ... | CBCount-1 | 0 | 1 | ...| CBCount-1 || 0 | 1 | ... | SRVCount-1 | 0 | 1 | ... | SRVCount-1 || 0 | 1 | ... | SamplerCount-1 | 0 | 1 | ...| SamplerCount-1 ||0 | 1 | ... | UAVCount-1 | 0 | 1 | ... | UAVCount-1 ||
-// --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-//
-// http://diligentgraphics.com/diligent-engine/architecture/d3d11/shader-resource-cache/
-class ShaderResourceCacheD3D11
-{
-public:
- ShaderResourceCacheD3D11()
- {}
-
- ~ShaderResourceCacheD3D11();
-
- // clang-format off
- ShaderResourceCacheD3D11 (const ShaderResourceCacheD3D11&) = delete;
- ShaderResourceCacheD3D11& operator = (const ShaderResourceCacheD3D11&) = delete;
- ShaderResourceCacheD3D11 (ShaderResourceCacheD3D11&&) = delete;
- ShaderResourceCacheD3D11& operator = (ShaderResourceCacheD3D11&&) = delete;
- // clang-format on
-
- /// Describes a resource associated with a cached constant buffer
- struct CachedCB
- {
- /// Strong reference to the buffer
- RefCntAutoPtr<BufferD3D11Impl> pBuff;
-
- __forceinline void Set(RefCntAutoPtr<BufferD3D11Impl>&& _pBuff)
- {
- pBuff = std::move(_pBuff);
- }
- };
-
- /// Describes a resource associated with a cached sampler
- struct CachedSampler
- {
- /// Strong reference to the sampler
- RefCntAutoPtr<class SamplerD3D11Impl> pSampler;
-
- __forceinline void Set(SamplerD3D11Impl* pSam)
- {
- pSampler = pSam;
- }
- };
-
- /// Describes a resource associated with a cached SRV or a UAV
- struct CachedResource
- {
- /// Wee keep strong reference to the view instead of the reference
- /// to the texture or buffer because this is more efficient from
- /// performance point of view: this avoids one pair of
- /// AddStrongRef()/ReleaseStrongRef(). The view holds strong reference
- /// to the texture or the buffer, so it makes no difference.
- RefCntAutoPtr<IDeviceObject> pView;
-
- TextureBaseD3D11* pTexture = nullptr;
- BufferD3D11Impl* pBuffer = nullptr;
-
- // There is no need to keep strong reference to D3D11 resource as
- // it is already kept by either pTexture or pBuffer
- ID3D11Resource* pd3d11Resource = nullptr;
-
- CachedResource() noexcept {}
-
- __forceinline void Set(RefCntAutoPtr<TextureViewD3D11Impl>&& pTexView)
- {
- pBuffer = nullptr;
- // Avoid unnecessary virtual function calls
- pTexture = pTexView ? ValidatedCast<TextureBaseD3D11>(pTexView->TextureViewD3D11Impl::GetTexture()) : nullptr;
- pView.Attach(pTexView.Detach());
- pd3d11Resource = pTexture ? pTexture->TextureBaseD3D11::GetD3D11Texture() : nullptr;
- }
-
- __forceinline void Set(RefCntAutoPtr<BufferViewD3D11Impl>&& pBufView)
- {
- pTexture = nullptr;
- // Avoid unnecessary virtual function calls
- pBuffer = pBufView ? ValidatedCast<BufferD3D11Impl>(pBufView->BufferViewD3D11Impl::GetBuffer()) : nullptr;
- pView.Attach(pBufView.Detach());
- pd3d11Resource = pBuffer ? pBuffer->BufferD3D11Impl::GetD3D11Buffer() : nullptr;
- }
- };
-
- static size_t GetRequriedMemorySize(const class ShaderResourcesD3D11& Resources);
-
- void Initialize(const class ShaderResourcesD3D11& Resources, class IMemoryAllocator& MemAllocator);
- void Initialize(Uint32 CBCount, Uint32 SRVCount, Uint32 SamplerCount, Uint32 UAVCount, class IMemoryAllocator& MemAllocator);
- void Destroy(class IMemoryAllocator& MemAllocator);
-
-
- __forceinline void SetCB(Uint32 Slot, RefCntAutoPtr<BufferD3D11Impl>&& pBuffD3D11Impl)
- {
- auto* pd3d11Buff = pBuffD3D11Impl ? pBuffD3D11Impl->BufferD3D11Impl::GetD3D11Buffer() : nullptr;
- SetD3D11ResourceInternal<CachedCB>(Slot, GetCBCount(), &ShaderResourceCacheD3D11::GetCBArrays, std::move(pBuffD3D11Impl), pd3d11Buff);
- }
-
- __forceinline void SetTexSRV(Uint32 Slot, RefCntAutoPtr<TextureViewD3D11Impl>&& pTexView)
- {
- auto* pd3d11SRV = pTexView ? static_cast<ID3D11ShaderResourceView*>(pTexView->TextureViewD3D11Impl::GetD3D11View()) : nullptr;
- SetD3D11ResourceInternal<CachedResource>(Slot, GetSRVCount(), &ShaderResourceCacheD3D11::GetSRVArrays, std::move(pTexView), pd3d11SRV);
- }
-
- __forceinline void SetBufSRV(Uint32 Slot, RefCntAutoPtr<BufferViewD3D11Impl>&& pBuffView)
- {
- auto* pd3d11SRV = pBuffView ? static_cast<ID3D11ShaderResourceView*>(pBuffView->BufferViewD3D11Impl::GetD3D11View()) : nullptr;
- SetD3D11ResourceInternal<CachedResource>(Slot, GetSRVCount(), &ShaderResourceCacheD3D11::GetSRVArrays, std::move(pBuffView), pd3d11SRV);
- }
-
- __forceinline void SetTexUAV(Uint32 Slot, RefCntAutoPtr<TextureViewD3D11Impl>&& pTexView)
- {
- auto* pd3d11UAV = pTexView ? static_cast<ID3D11UnorderedAccessView*>(pTexView->TextureViewD3D11Impl::GetD3D11View()) : nullptr;
- SetD3D11ResourceInternal<CachedResource>(Slot, GetUAVCount(), &ShaderResourceCacheD3D11::GetUAVArrays, std::move(pTexView), pd3d11UAV);
- }
-
- __forceinline void SetBufUAV(Uint32 Slot, RefCntAutoPtr<BufferViewD3D11Impl>&& pBuffView)
- {
- auto* pd3d11UAV = pBuffView ? static_cast<ID3D11UnorderedAccessView*>(pBuffView->BufferViewD3D11Impl::GetD3D11View()) : nullptr;
- SetD3D11ResourceInternal<CachedResource>(Slot, GetUAVCount(), &ShaderResourceCacheD3D11::GetUAVArrays, std::move(pBuffView), pd3d11UAV);
- }
-
- __forceinline void SetSampler(Uint32 Slot, SamplerD3D11Impl* pSampler)
- {
- auto* pd3d11Sampler = pSampler ? pSampler->SamplerD3D11Impl::GetD3D11SamplerState() : nullptr;
- SetD3D11ResourceInternal<CachedSampler>(Slot, GetSamplerCount(), &ShaderResourceCacheD3D11::GetSamplerArrays, pSampler, pd3d11Sampler);
- }
-
-
-
- __forceinline CachedCB& GetCB(Uint32 Slot)
- {
- VERIFY(Slot < GetCBCount(), "CB slot is out of range");
- ShaderResourceCacheD3D11::CachedCB* CBs;
- ID3D11Buffer** pd3d11CBs;
- GetCBArrays(CBs, pd3d11CBs);
- return CBs[Slot];
- }
-
- __forceinline CachedResource& GetSRV(Uint32 Slot)
- {
- VERIFY(Slot < GetSRVCount(), "SRV slot is out of range");
- ShaderResourceCacheD3D11::CachedResource* SRVResources;
- ID3D11ShaderResourceView** pd3d11SRVs;
- GetSRVArrays(SRVResources, pd3d11SRVs);
- return SRVResources[Slot];
- }
-
- __forceinline CachedResource& GetUAV(Uint32 Slot)
- {
- VERIFY(Slot < GetUAVCount(), "UAV slot is out of range");
- ShaderResourceCacheD3D11::CachedResource* UAVResources;
- ID3D11UnorderedAccessView** pd3d11UAVs;
- GetUAVArrays(UAVResources, pd3d11UAVs);
- return UAVResources[Slot];
- }
-
- __forceinline CachedSampler& GetSampler(Uint32 Slot)
- {
- VERIFY(Slot < GetSamplerCount(), "Sampler slot is out of range");
- ShaderResourceCacheD3D11::CachedSampler* Samplers;
- ID3D11SamplerState** pd3d11Samplers;
- GetSamplerArrays(Samplers, pd3d11Samplers);
- return Samplers[Slot];
- }
-
-
- __forceinline bool IsCBBound(Uint32 Slot) const
- {
- CachedCB* CBs = nullptr;
- ID3D11Buffer** d3d11CBs = nullptr;
- const_cast<ShaderResourceCacheD3D11*>(this)->GetCBArrays(CBs, d3d11CBs);
- if (Slot < GetCBCount() && d3d11CBs[Slot] != nullptr)
- {
- VERIFY(CBs[Slot].pBuff != nullptr, "No relevant buffer resource");
- return true;
- }
- return false;
- }
-
- __forceinline bool IsSRVBound(Uint32 Slot, bool dbgIsTextureView) const
- {
- CachedResource* SRVResources = nullptr;
- ID3D11ShaderResourceView** d3d11SRVs = nullptr;
- const_cast<ShaderResourceCacheD3D11*>(this)->GetSRVArrays(SRVResources, d3d11SRVs);
- if (Slot < GetSRVCount() && d3d11SRVs[Slot] != nullptr)
- {
- VERIFY((dbgIsTextureView && SRVResources[Slot].pTexture != nullptr) || (!dbgIsTextureView && SRVResources[Slot].pBuffer != nullptr),
- "No relevant resource");
- return true;
- }
- return false;
- }
-
- __forceinline bool IsUAVBound(Uint32 Slot, bool dbgIsTextureView) const
- {
- CachedResource* UAVResources = nullptr;
- ID3D11UnorderedAccessView** d3d11UAVs = nullptr;
- const_cast<ShaderResourceCacheD3D11*>(this)->GetUAVArrays(UAVResources, d3d11UAVs);
- if (Slot < GetUAVCount() && d3d11UAVs[Slot] != nullptr)
- {
- VERIFY((dbgIsTextureView && UAVResources[Slot].pTexture != nullptr) || (!dbgIsTextureView && UAVResources[Slot].pBuffer != nullptr),
- "No relevant resource");
- return true;
- }
- return false;
- }
-
- __forceinline bool IsSamplerBound(Uint32 Slot) const
- {
- CachedSampler* Samplers = nullptr;
- ID3D11SamplerState** d3d11Samplers = nullptr;
- const_cast<ShaderResourceCacheD3D11*>(this)->GetSamplerArrays(Samplers, d3d11Samplers);
- if (Slot < GetSamplerCount() && d3d11Samplers[Slot] != nullptr)
- {
- VERIFY(Samplers[Slot].pSampler != nullptr, "No relevant sampler");
- return true;
- }
- return false;
- }
-
- void dbgVerifyCacheConsistency();
-
- // clang-format off
- __forceinline Uint32 GetCBCount() const { return (m_SRVOffset - m_CBOffset) / (sizeof(CachedCB) + sizeof(ID3D11Buffer*)); }
- __forceinline Uint32 GetSRVCount() const { return (m_SamplerOffset - m_SRVOffset) / (sizeof(CachedResource) + sizeof(ID3D11ShaderResourceView*)); }
- __forceinline Uint32 GetSamplerCount() const { return (m_UAVOffset - m_SamplerOffset) / (sizeof(CachedSampler) + sizeof(ID3D11SamplerState*)); }
- __forceinline Uint32 GetUAVCount() const { return (m_MemoryEndOffset - m_UAVOffset) / (sizeof(CachedResource) + sizeof(ID3D11UnorderedAccessView*)); }
- // clang-format on
-
- __forceinline void GetCBArrays(CachedCB*& CBs, ID3D11Buffer**& pd3d11CBs)
- {
- CBs = reinterpret_cast<CachedCB*>(m_pResourceData + m_CBOffset);
- pd3d11CBs = reinterpret_cast<ID3D11Buffer**>(CBs + GetCBCount());
- }
-
- __forceinline void GetSRVArrays(CachedResource*& SRVResources, ID3D11ShaderResourceView**& d3d11SRVs)
- {
- SRVResources = reinterpret_cast<CachedResource*>(m_pResourceData + m_SRVOffset);
- d3d11SRVs = reinterpret_cast<ID3D11ShaderResourceView**>(SRVResources + GetSRVCount());
- }
-
- __forceinline void GetSamplerArrays(CachedSampler*& Samplers, ID3D11SamplerState**& pd3d11Samplers)
- {
- Samplers = reinterpret_cast<CachedSampler*>(m_pResourceData + m_SamplerOffset);
- pd3d11Samplers = reinterpret_cast<ID3D11SamplerState**>(Samplers + GetSamplerCount());
- }
-
- __forceinline void GetUAVArrays(CachedResource*& UAVResources, ID3D11UnorderedAccessView**& pd3d11UAVs)
- {
- UAVResources = reinterpret_cast<CachedResource*>(m_pResourceData + m_UAVOffset);
- pd3d11UAVs = reinterpret_cast<ID3D11UnorderedAccessView**>(UAVResources + GetUAVCount());
- }
-
- __forceinline bool IsInitialized() const
- {
- return m_MemoryEndOffset != InvalidResourceOffset;
- }
-
-private:
- template <typename TCachedResourceType, typename TGetResourceArraysFunc, typename TSrcResourceType, typename TD3D11ResourceType>
- __forceinline void SetD3D11ResourceInternal(Uint32 Slot, Uint32 Size, TGetResourceArraysFunc GetArrays, TSrcResourceType&& pResource, TD3D11ResourceType* pd3d11Resource)
- {
- VERIFY(Slot < Size, "Resource cache is not big enough");
- VERIFY(pResource != nullptr && pd3d11Resource != nullptr || pResource == nullptr && pd3d11Resource == nullptr,
- "Resource and D3D11 resource must be set/unset atomically");
- TCachedResourceType* Resources;
- TD3D11ResourceType** d3d11ResArr;
- (this->*GetArrays)(Resources, d3d11ResArr);
- Resources[Slot].Set(std::forward<TSrcResourceType>(pResource));
- d3d11ResArr[Slot] = pd3d11Resource;
- }
-
- static constexpr const Uint16 InvalidResourceOffset = 0xFFFF;
- // Resource limits in D3D11:
- // Max CB count: 14
- // Max SRV count: 128
- // Max Sampler count: 16
- // Max UAV count: 8
- static constexpr const Uint16 m_CBOffset = 0;
- Uint16 m_SRVOffset = InvalidResourceOffset;
- Uint16 m_SamplerOffset = InvalidResourceOffset;
- Uint16 m_UAVOffset = InvalidResourceOffset;
- Uint16 m_MemoryEndOffset = InvalidResourceOffset;
-
- Uint8* m_pResourceData = nullptr;
-
-#ifdef _DEBUG
- IMemoryAllocator* m_pdbgMemoryAllocator = nullptr;
-#endif
-};
-
-} // namespace Diligent
+/* + * Copyright 2019-2020 Diligent Graphics LLC + * Copyright 2015-2019 Egor Yusov + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#pragma once + +/// \file +/// Declaration of Diligent::ShaderResourceCacheD3D11 class + +#include "TextureBaseD3D11.hpp" +#include "BufferD3D11Impl.hpp" +#include "SamplerD3D11Impl.hpp" + +namespace Diligent +{ + +/// The class implements a cache that holds resources bound to a specific shader stage +// All resources are stored in the continuous memory using the following layout: +// +// | CachedCB | ID3D11Buffer* || CachedResource | ID3D11ShaderResourceView* || CachedSampler | ID3D11SamplerState* || CachedResource | ID3D11UnorderedAccessView*|| +// |---------------------------------------------------||--------------------------|---------------------------||------------------------------|-----------------------------||-------------------------|---------------------------|| +// | 0 | 1 | ... | CBCount-1 | 0 | 1 | ...| CBCount-1 || 0 | 1 | ... | SRVCount-1 | 0 | 1 | ... | SRVCount-1 || 0 | 1 | ... | SamplerCount-1 | 0 | 1 | ...| SamplerCount-1 ||0 | 1 | ... | UAVCount-1 | 0 | 1 | ... | UAVCount-1 || +// -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +// +// +// http://diligentgraphics.com/diligent-engine/architecture/d3d11/shader-resource-cache/ +class ShaderResourceCacheD3D11 +{ +public: + ShaderResourceCacheD3D11() + {} + + ~ShaderResourceCacheD3D11(); + + // clang-format off + ShaderResourceCacheD3D11 (const ShaderResourceCacheD3D11&) = delete; + ShaderResourceCacheD3D11& operator = (const ShaderResourceCacheD3D11&) = delete; + ShaderResourceCacheD3D11 (ShaderResourceCacheD3D11&&) = delete; + ShaderResourceCacheD3D11& operator = (ShaderResourceCacheD3D11&&) = delete; + // clang-format on + + /// Describes a resource associated with a cached constant buffer + struct CachedCB + { + /// Strong reference to the buffer + RefCntAutoPtr<BufferD3D11Impl> pBuff; + + __forceinline void Set(RefCntAutoPtr<BufferD3D11Impl>&& _pBuff) + { + pBuff = std::move(_pBuff); + } + }; + + /// Describes a resource associated with a cached sampler + struct CachedSampler + { + /// Strong reference to the sampler + RefCntAutoPtr<class SamplerD3D11Impl> pSampler; + + __forceinline void Set(SamplerD3D11Impl* pSam) + { + pSampler = pSam; + } + }; + + /// Describes a resource associated with a cached SRV or a UAV + struct CachedResource + { + /// Wee keep strong reference to the view instead of the reference + /// to the texture or buffer because this is more efficient from + /// performance point of view: this avoids one pair of + /// AddStrongRef()/ReleaseStrongRef(). The view holds strong reference + /// to the texture or the buffer, so it makes no difference. + RefCntAutoPtr<IDeviceObject> pView; + + TextureBaseD3D11* pTexture = nullptr; + BufferD3D11Impl* pBuffer = nullptr; + + // There is no need to keep strong reference to D3D11 resource as + // it is already kept by either pTexture or pBuffer + ID3D11Resource* pd3d11Resource = nullptr; + + CachedResource() noexcept {} + + __forceinline void Set(RefCntAutoPtr<TextureViewD3D11Impl>&& pTexView) + { + pBuffer = nullptr; + // Avoid unnecessary virtual function calls + pTexture = pTexView ? ValidatedCast<TextureBaseD3D11>(pTexView->TextureViewD3D11Impl::GetTexture()) : nullptr; + pView.Attach(pTexView.Detach()); + pd3d11Resource = pTexture ? pTexture->TextureBaseD3D11::GetD3D11Texture() : nullptr; + } + + __forceinline void Set(RefCntAutoPtr<BufferViewD3D11Impl>&& pBufView) + { + pTexture = nullptr; + // Avoid unnecessary virtual function calls + pBuffer = pBufView ? ValidatedCast<BufferD3D11Impl>(pBufView->BufferViewD3D11Impl::GetBuffer()) : nullptr; + pView.Attach(pBufView.Detach()); + pd3d11Resource = pBuffer ? pBuffer->BufferD3D11Impl::GetD3D11Buffer() : nullptr; + } + }; + + static size_t GetRequriedMemorySize(const class ShaderResourcesD3D11& Resources); + + void Initialize(const class ShaderResourcesD3D11& Resources, class IMemoryAllocator& MemAllocator); + void Initialize(Uint32 CBCount, Uint32 SRVCount, Uint32 SamplerCount, Uint32 UAVCount, class IMemoryAllocator& MemAllocator); + void Destroy(class IMemoryAllocator& MemAllocator); + + + __forceinline void SetCB(Uint32 Slot, RefCntAutoPtr<BufferD3D11Impl>&& pBuffD3D11Impl) + { + auto* pd3d11Buff = pBuffD3D11Impl ? pBuffD3D11Impl->BufferD3D11Impl::GetD3D11Buffer() : nullptr; + SetD3D11ResourceInternal<CachedCB>(Slot, GetCBCount(), &ShaderResourceCacheD3D11::GetCBArrays, std::move(pBuffD3D11Impl), pd3d11Buff); + } + + __forceinline void SetTexSRV(Uint32 Slot, RefCntAutoPtr<TextureViewD3D11Impl>&& pTexView) + { + auto* pd3d11SRV = pTexView ? static_cast<ID3D11ShaderResourceView*>(pTexView->TextureViewD3D11Impl::GetD3D11View()) : nullptr; + SetD3D11ResourceInternal<CachedResource>(Slot, GetSRVCount(), &ShaderResourceCacheD3D11::GetSRVArrays, std::move(pTexView), pd3d11SRV); + } + + __forceinline void SetBufSRV(Uint32 Slot, RefCntAutoPtr<BufferViewD3D11Impl>&& pBuffView) + { + auto* pd3d11SRV = pBuffView ? static_cast<ID3D11ShaderResourceView*>(pBuffView->BufferViewD3D11Impl::GetD3D11View()) : nullptr; + SetD3D11ResourceInternal<CachedResource>(Slot, GetSRVCount(), &ShaderResourceCacheD3D11::GetSRVArrays, std::move(pBuffView), pd3d11SRV); + } + + __forceinline void SetTexUAV(Uint32 Slot, RefCntAutoPtr<TextureViewD3D11Impl>&& pTexView) + { + auto* pd3d11UAV = pTexView ? static_cast<ID3D11UnorderedAccessView*>(pTexView->TextureViewD3D11Impl::GetD3D11View()) : nullptr; + SetD3D11ResourceInternal<CachedResource>(Slot, GetUAVCount(), &ShaderResourceCacheD3D11::GetUAVArrays, std::move(pTexView), pd3d11UAV); + } + + __forceinline void SetBufUAV(Uint32 Slot, RefCntAutoPtr<BufferViewD3D11Impl>&& pBuffView) + { + auto* pd3d11UAV = pBuffView ? static_cast<ID3D11UnorderedAccessView*>(pBuffView->BufferViewD3D11Impl::GetD3D11View()) : nullptr; + SetD3D11ResourceInternal<CachedResource>(Slot, GetUAVCount(), &ShaderResourceCacheD3D11::GetUAVArrays, std::move(pBuffView), pd3d11UAV); + } + + __forceinline void SetSampler(Uint32 Slot, SamplerD3D11Impl* pSampler) + { + auto* pd3d11Sampler = pSampler ? pSampler->SamplerD3D11Impl::GetD3D11SamplerState() : nullptr; + SetD3D11ResourceInternal<CachedSampler>(Slot, GetSamplerCount(), &ShaderResourceCacheD3D11::GetSamplerArrays, pSampler, pd3d11Sampler); + } + + + + __forceinline CachedCB& GetCB(Uint32 Slot) + { + VERIFY(Slot < GetCBCount(), "CB slot is out of range"); + ShaderResourceCacheD3D11::CachedCB* CBs; + ID3D11Buffer** pd3d11CBs; + GetCBArrays(CBs, pd3d11CBs); + return CBs[Slot]; + } + + __forceinline CachedResource& GetSRV(Uint32 Slot) + { + VERIFY(Slot < GetSRVCount(), "SRV slot is out of range"); + ShaderResourceCacheD3D11::CachedResource* SRVResources; + ID3D11ShaderResourceView** pd3d11SRVs; + GetSRVArrays(SRVResources, pd3d11SRVs); + return SRVResources[Slot]; + } + + __forceinline CachedResource& GetUAV(Uint32 Slot) + { + VERIFY(Slot < GetUAVCount(), "UAV slot is out of range"); + ShaderResourceCacheD3D11::CachedResource* UAVResources; + ID3D11UnorderedAccessView** pd3d11UAVs; + GetUAVArrays(UAVResources, pd3d11UAVs); + return UAVResources[Slot]; + } + + __forceinline CachedSampler& GetSampler(Uint32 Slot) + { + VERIFY(Slot < GetSamplerCount(), "Sampler slot is out of range"); + ShaderResourceCacheD3D11::CachedSampler* Samplers; + ID3D11SamplerState** pd3d11Samplers; + GetSamplerArrays(Samplers, pd3d11Samplers); + return Samplers[Slot]; + } + + + __forceinline bool IsCBBound(Uint32 Slot) const + { + CachedCB* CBs = nullptr; + ID3D11Buffer** d3d11CBs = nullptr; + const_cast<ShaderResourceCacheD3D11*>(this)->GetCBArrays(CBs, d3d11CBs); + if (Slot < GetCBCount() && d3d11CBs[Slot] != nullptr) + { + VERIFY(CBs[Slot].pBuff != nullptr, "No relevant buffer resource"); + return true; + } + return false; + } + + __forceinline bool IsSRVBound(Uint32 Slot, bool dbgIsTextureView) const + { + CachedResource* SRVResources = nullptr; + ID3D11ShaderResourceView** d3d11SRVs = nullptr; + const_cast<ShaderResourceCacheD3D11*>(this)->GetSRVArrays(SRVResources, d3d11SRVs); + if (Slot < GetSRVCount() && d3d11SRVs[Slot] != nullptr) + { + VERIFY((dbgIsTextureView && SRVResources[Slot].pTexture != nullptr) || (!dbgIsTextureView && SRVResources[Slot].pBuffer != nullptr), + "No relevant resource"); + return true; + } + return false; + } + + __forceinline bool IsUAVBound(Uint32 Slot, bool dbgIsTextureView) const + { + CachedResource* UAVResources = nullptr; + ID3D11UnorderedAccessView** d3d11UAVs = nullptr; + const_cast<ShaderResourceCacheD3D11*>(this)->GetUAVArrays(UAVResources, d3d11UAVs); + if (Slot < GetUAVCount() && d3d11UAVs[Slot] != nullptr) + { + VERIFY((dbgIsTextureView && UAVResources[Slot].pTexture != nullptr) || (!dbgIsTextureView && UAVResources[Slot].pBuffer != nullptr), + "No relevant resource"); + return true; + } + return false; + } + + __forceinline bool IsSamplerBound(Uint32 Slot) const + { + CachedSampler* Samplers = nullptr; + ID3D11SamplerState** d3d11Samplers = nullptr; + const_cast<ShaderResourceCacheD3D11*>(this)->GetSamplerArrays(Samplers, d3d11Samplers); + if (Slot < GetSamplerCount() && d3d11Samplers[Slot] != nullptr) + { + VERIFY(Samplers[Slot].pSampler != nullptr, "No relevant sampler"); + return true; + } + return false; + } + + void dbgVerifyCacheConsistency(); + + // clang-format off + __forceinline Uint32 GetCBCount() const { return (m_SRVOffset - m_CBOffset) / (sizeof(CachedCB) + sizeof(ID3D11Buffer*)); } + __forceinline Uint32 GetSRVCount() const { return (m_SamplerOffset - m_SRVOffset) / (sizeof(CachedResource) + sizeof(ID3D11ShaderResourceView*)); } + __forceinline Uint32 GetSamplerCount() const { return (m_UAVOffset - m_SamplerOffset) / (sizeof(CachedSampler) + sizeof(ID3D11SamplerState*)); } + __forceinline Uint32 GetUAVCount() const { return (m_MemoryEndOffset - m_UAVOffset) / (sizeof(CachedResource) + sizeof(ID3D11UnorderedAccessView*)); } + // clang-format on + + __forceinline void GetCBArrays(CachedCB*& CBs, ID3D11Buffer**& pd3d11CBs) + { + CBs = reinterpret_cast<CachedCB*>(m_pResourceData + m_CBOffset); + pd3d11CBs = reinterpret_cast<ID3D11Buffer**>(CBs + GetCBCount()); + } + + __forceinline void GetSRVArrays(CachedResource*& SRVResources, ID3D11ShaderResourceView**& d3d11SRVs) + { + SRVResources = reinterpret_cast<CachedResource*>(m_pResourceData + m_SRVOffset); + d3d11SRVs = reinterpret_cast<ID3D11ShaderResourceView**>(SRVResources + GetSRVCount()); + } + + __forceinline void GetSamplerArrays(CachedSampler*& Samplers, ID3D11SamplerState**& pd3d11Samplers) + { + Samplers = reinterpret_cast<CachedSampler*>(m_pResourceData + m_SamplerOffset); + pd3d11Samplers = reinterpret_cast<ID3D11SamplerState**>(Samplers + GetSamplerCount()); + } + + __forceinline void GetUAVArrays(CachedResource*& UAVResources, ID3D11UnorderedAccessView**& pd3d11UAVs) + { + UAVResources = reinterpret_cast<CachedResource*>(m_pResourceData + m_UAVOffset); + pd3d11UAVs = reinterpret_cast<ID3D11UnorderedAccessView**>(UAVResources + GetUAVCount()); + } + + __forceinline bool IsInitialized() const + { + return m_MemoryEndOffset != InvalidResourceOffset; + } + +private: + template <typename TCachedResourceType, typename TGetResourceArraysFunc, typename TSrcResourceType, typename TD3D11ResourceType> + __forceinline void SetD3D11ResourceInternal(Uint32 Slot, Uint32 Size, TGetResourceArraysFunc GetArrays, TSrcResourceType&& pResource, TD3D11ResourceType* pd3d11Resource) + { + VERIFY(Slot < Size, "Resource cache is not big enough"); + VERIFY(pResource != nullptr && pd3d11Resource != nullptr || pResource == nullptr && pd3d11Resource == nullptr, + "Resource and D3D11 resource must be set/unset atomically"); + TCachedResourceType* Resources; + TD3D11ResourceType** d3d11ResArr; + (this->*GetArrays)(Resources, d3d11ResArr); + Resources[Slot].Set(std::forward<TSrcResourceType>(pResource)); + d3d11ResArr[Slot] = pd3d11Resource; + } + + static constexpr const Uint16 InvalidResourceOffset = 0xFFFF; + // Resource limits in D3D11: + // Max CB count: 14 + // Max SRV count: 128 + // Max Sampler count: 16 + // Max UAV count: 8 + static constexpr const Uint16 m_CBOffset = 0; + Uint16 m_SRVOffset = InvalidResourceOffset; + Uint16 m_SamplerOffset = InvalidResourceOffset; + Uint16 m_UAVOffset = InvalidResourceOffset; + Uint16 m_MemoryEndOffset = InvalidResourceOffset; + + Uint8* m_pResourceData = nullptr; + +#ifdef _DEBUG + IMemoryAllocator* m_pdbgMemoryAllocator = nullptr; +#endif +}; + +} // namespace Diligent diff --git a/Graphics/GraphicsEngineD3D11/include/ShaderResourceLayoutD3D11.h b/Graphics/GraphicsEngineD3D11/include/ShaderResourceLayoutD3D11.hpp index 3c42624e..9b58ea3c 100644 --- a/Graphics/GraphicsEngineD3D11/include/ShaderResourceLayoutD3D11.h +++ b/Graphics/GraphicsEngineD3D11/include/ShaderResourceLayoutD3D11.hpp @@ -30,13 +30,13 @@ /// \file /// Declaration of Diligent::ShaderResourceLayoutD3D11 class -#include "ShaderResources.h" -#include "ShaderBase.h" -#include "ShaderResourceCacheD3D11.h" +#include "ShaderResources.hpp" +#include "ShaderBase.hpp" +#include "ShaderResourceCacheD3D11.hpp" #include "EngineD3D11Defines.h" #include "STDAllocator.h" -#include "ShaderVariableD3DBase.h" -#include "ShaderResourcesD3D11.h" +#include "ShaderVariableD3DBase.hpp" +#include "ShaderResourcesD3D11.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/include/ShaderResourcesD3D11.h b/Graphics/GraphicsEngineD3D11/include/ShaderResourcesD3D11.hpp index 5e3ac600..6fe91203 100644 --- a/Graphics/GraphicsEngineD3D11/include/ShaderResourcesD3D11.h +++ b/Graphics/GraphicsEngineD3D11/include/ShaderResourcesD3D11.hpp @@ -83,7 +83,7 @@ #include <vector> -#include "ShaderResources.h" +#include "ShaderResources.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/include/SwapChainD3D11Impl.h b/Graphics/GraphicsEngineD3D11/include/SwapChainD3D11Impl.hpp index 3997f1c7..f40b4b9b 100644 --- a/Graphics/GraphicsEngineD3D11/include/SwapChainD3D11Impl.h +++ b/Graphics/GraphicsEngineD3D11/include/SwapChainD3D11Impl.hpp @@ -31,7 +31,7 @@ /// Declaration of Diligent::SwapChainD3D11Impl class #include "SwapChainD3D11.h" -#include "SwapChainD3DBase.h" +#include "SwapChainD3DBase.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/include/Texture1D_D3D11.h b/Graphics/GraphicsEngineD3D11/include/Texture1D_D3D11.hpp index 0be21f90..7ffcb7ba 100644 --- a/Graphics/GraphicsEngineD3D11/include/Texture1D_D3D11.h +++ b/Graphics/GraphicsEngineD3D11/include/Texture1D_D3D11.hpp @@ -30,7 +30,7 @@ /// \file /// Declaration of Diligent::Texture1D_D3D11 class -#include "TextureBaseD3D11.h" +#include "TextureBaseD3D11.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/include/Texture2D_D3D11.h b/Graphics/GraphicsEngineD3D11/include/Texture2D_D3D11.hpp index 6c8d41f0..5df66c0c 100644 --- a/Graphics/GraphicsEngineD3D11/include/Texture2D_D3D11.h +++ b/Graphics/GraphicsEngineD3D11/include/Texture2D_D3D11.hpp @@ -30,7 +30,7 @@ /// \file /// Declaration of Diligent::Texture2D_D3D11 class -#include "TextureBaseD3D11.h" +#include "TextureBaseD3D11.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/include/Texture3D_D3D11.h b/Graphics/GraphicsEngineD3D11/include/Texture3D_D3D11.hpp index 9ae638a1..b7e1710f 100644 --- a/Graphics/GraphicsEngineD3D11/include/Texture3D_D3D11.h +++ b/Graphics/GraphicsEngineD3D11/include/Texture3D_D3D11.hpp @@ -30,7 +30,7 @@ /// \file /// Declaration of Diligent::Texture3D_D3D11 class -#include "TextureBaseD3D11.h" +#include "TextureBaseD3D11.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/include/TextureBaseD3D11.h b/Graphics/GraphicsEngineD3D11/include/TextureBaseD3D11.hpp index ece4e088..c954f844 100644 --- a/Graphics/GraphicsEngineD3D11/include/TextureBaseD3D11.h +++ b/Graphics/GraphicsEngineD3D11/include/TextureBaseD3D11.hpp @@ -32,9 +32,9 @@ #include "TextureD3D11.h" #include "RenderDeviceD3D11.h" -#include "TextureBase.h" -#include "TextureViewD3D11Impl.h" -#include "RenderDeviceD3D11Impl.h" +#include "TextureBase.hpp" +#include "TextureViewD3D11Impl.hpp" +#include "RenderDeviceD3D11Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/include/TextureViewD3D11Impl.h b/Graphics/GraphicsEngineD3D11/include/TextureViewD3D11Impl.hpp index 0b104597..20c2afbf 100644 --- a/Graphics/GraphicsEngineD3D11/include/TextureViewD3D11Impl.h +++ b/Graphics/GraphicsEngineD3D11/include/TextureViewD3D11Impl.hpp @@ -32,8 +32,8 @@ #include "TextureViewD3D11.h" #include "RenderDeviceD3D11.h" -#include "TextureViewBase.h" -#include "RenderDeviceD3D11Impl.h" +#include "TextureViewBase.hpp" +#include "RenderDeviceD3D11Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/include/pch.h b/Graphics/GraphicsEngineD3D11/include/pch.h index bbc00ae1..ea2eab2f 100644 --- a/Graphics/GraphicsEngineD3D11/include/pch.h +++ b/Graphics/GraphicsEngineD3D11/include/pch.h @@ -74,8 +74,8 @@ #include "Errors.h" #include "RefCntAutoPtr.h" #include "DebugUtilities.h" -#include "D3DErrors.h" -#include "RenderDeviceBase.h" +#include "D3DErrors.hpp" +#include "RenderDeviceBase.hpp" #include "D3D11TypeConversions.h" #include "ValidatedCast.h" #include <atlcomcli.h> diff --git a/Graphics/GraphicsEngineD3D11/src/BufferD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/BufferD3D11Impl.cpp index 02235237..2d2d10b5 100644 --- a/Graphics/GraphicsEngineD3D11/src/BufferD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/BufferD3D11Impl.cpp @@ -28,11 +28,11 @@ #include "pch.h" #include <atlbase.h> -#include "BufferD3D11Impl.h" -#include "RenderDeviceD3D11Impl.h" -#include "DeviceContextD3D11Impl.h" +#include "BufferD3D11Impl.hpp" +#include "RenderDeviceD3D11Impl.hpp" +#include "DeviceContextD3D11Impl.hpp" #include "D3D11TypeConversions.h" -#include "BufferViewD3D11Impl.h" +#include "BufferViewD3D11Impl.hpp" #include "GraphicsAccessories.hpp" #include "EngineMemory.h" diff --git a/Graphics/GraphicsEngineD3D11/src/BufferViewD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/BufferViewD3D11Impl.cpp index ff78e3dc..e02bd8ff 100644 --- a/Graphics/GraphicsEngineD3D11/src/BufferViewD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/BufferViewD3D11Impl.cpp @@ -26,7 +26,7 @@ */ #include "pch.h" -#include "BufferViewD3D11Impl.h" +#include "BufferViewD3D11Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/src/CommandListD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/CommandListD3D11Impl.cpp index 27981375..39eb87bd 100644 --- a/Graphics/GraphicsEngineD3D11/src/CommandListD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/CommandListD3D11Impl.cpp @@ -28,7 +28,7 @@ #include "pch.h" #include <atlbase.h> -#include "CommandListD3D11Impl.h" +#include "CommandListD3D11Impl.hpp" #include "EngineMemory.h" namespace Diligent diff --git a/Graphics/GraphicsEngineD3D11/src/D3D11TypeConversions.cpp b/Graphics/GraphicsEngineD3D11/src/D3D11TypeConversions.cpp index 59a937b5..0d76db58 100644 --- a/Graphics/GraphicsEngineD3D11/src/D3D11TypeConversions.cpp +++ b/Graphics/GraphicsEngineD3D11/src/D3D11TypeConversions.cpp @@ -29,8 +29,8 @@ #include "D3D11TypeConversions.h" #include "D3D11TypeDefinitions.h" -#include "D3DTypeConversionImpl.h" -#include "D3DViewDescConversionImpl.h" +#include "D3DTypeConversionImpl.hpp" +#include "D3DViewDescConversionImpl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp index 78f08bf4..0c19756c 100755 --- a/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp @@ -26,22 +26,22 @@ */
#include "pch.h"
-#include "DeviceContextD3D11Impl.h"
-#include "BufferD3D11Impl.h"
-#include "ShaderD3D11Impl.h"
-#include "Texture1D_D3D11.h"
-#include "Texture2D_D3D11.h"
-#include "Texture3D_D3D11.h"
-#include "SamplerD3D11Impl.h"
+#include "DeviceContextD3D11Impl.hpp"
+#include "BufferD3D11Impl.hpp"
+#include "ShaderD3D11Impl.hpp"
+#include "Texture1D_D3D11.hpp"
+#include "Texture2D_D3D11.hpp"
+#include "Texture3D_D3D11.hpp"
+#include "SamplerD3D11Impl.hpp"
#include "D3D11TypeConversions.h"
-#include "TextureViewD3D11Impl.h"
-#include "PipelineStateD3D11Impl.h"
-#include "ShaderResourceBindingD3D11Impl.h"
+#include "TextureViewD3D11Impl.hpp"
+#include "PipelineStateD3D11Impl.hpp"
+#include "ShaderResourceBindingD3D11Impl.hpp"
#include "EngineD3D11Defines.h"
-#include "CommandListD3D11Impl.h"
-#include "RenderDeviceD3D11Impl.h"
-#include "FenceD3D11Impl.h"
-#include "QueryD3D11Impl.h"
+#include "CommandListD3D11Impl.hpp"
+#include "RenderDeviceD3D11Impl.hpp"
+#include "FenceD3D11Impl.hpp"
+#include "QueryD3D11Impl.hpp"
namespace Diligent
{
diff --git a/Graphics/GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp b/Graphics/GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp index 623dde46..252697bd 100644 --- a/Graphics/GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp +++ b/Graphics/GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp @@ -30,12 +30,12 @@ #include "pch.h" #include "EngineFactoryD3D11.h" -#include "RenderDeviceD3D11Impl.h" -#include "DeviceContextD3D11Impl.h" -#include "SwapChainD3D11Impl.h" +#include "RenderDeviceD3D11Impl.hpp" +#include "DeviceContextD3D11Impl.hpp" +#include "SwapChainD3D11Impl.hpp" #include "D3D11TypeConversions.h" #include "EngineMemory.h" -#include "EngineFactoryD3DBase.h" +#include "EngineFactoryD3DBase.hpp" #include <Windows.h> #include <dxgi1_2.h> diff --git a/Graphics/GraphicsEngineD3D11/src/FenceD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/FenceD3D11Impl.cpp index 9a651121..3cb1b91e 100644 --- a/Graphics/GraphicsEngineD3D11/src/FenceD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/FenceD3D11Impl.cpp @@ -28,7 +28,7 @@ #include "pch.h" #include <atlbase.h> -#include "FenceD3D11Impl.h" +#include "FenceD3D11Impl.hpp" #include "EngineMemory.h" namespace Diligent diff --git a/Graphics/GraphicsEngineD3D11/src/PipelineStateD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/PipelineStateD3D11Impl.cpp index 7cc5313d..02f0dac8 100644 --- a/Graphics/GraphicsEngineD3D11/src/PipelineStateD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/PipelineStateD3D11Impl.cpp @@ -27,11 +27,11 @@ #include "pch.h" #include <array> -#include "PipelineStateD3D11Impl.h" -#include "RenderDeviceD3D11Impl.h" -#include "ShaderResourceBindingD3D11Impl.h" +#include "PipelineStateD3D11Impl.hpp" +#include "RenderDeviceD3D11Impl.hpp" +#include "ShaderResourceBindingD3D11Impl.hpp" #include "EngineMemory.h" -#include "ShaderD3D11Impl.h" +#include "ShaderD3D11Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/src/QueryD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/QueryD3D11Impl.cpp index 751810de..bf70dfc1 100644 --- a/Graphics/GraphicsEngineD3D11/src/QueryD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/QueryD3D11Impl.cpp @@ -27,8 +27,8 @@ #include "pch.h" -#include "QueryD3D11Impl.h" -#include "DeviceContextD3D11Impl.h" +#include "QueryD3D11Impl.hpp" +#include "DeviceContextD3D11Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp index b7e7a0bc..bcd9bec6 100644 --- a/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp @@ -26,20 +26,20 @@ */ #include "pch.h" -#include "RenderDeviceD3D11Impl.h" -#include "DeviceContextD3D11Impl.h" -#include "BufferD3D11Impl.h" -#include "ShaderD3D11Impl.h" -#include "Texture1D_D3D11.h" -#include "Texture2D_D3D11.h" -#include "Texture3D_D3D11.h" -#include "SamplerD3D11Impl.h" +#include "RenderDeviceD3D11Impl.hpp" +#include "DeviceContextD3D11Impl.hpp" +#include "BufferD3D11Impl.hpp" +#include "ShaderD3D11Impl.hpp" +#include "Texture1D_D3D11.hpp" +#include "Texture2D_D3D11.hpp" +#include "Texture3D_D3D11.hpp" +#include "SamplerD3D11Impl.hpp" #include "D3D11TypeConversions.h" -#include "TextureViewD3D11Impl.h" -#include "PipelineStateD3D11Impl.h" -#include "ShaderResourceBindingD3D11Impl.h" -#include "FenceD3D11Impl.h" -#include "QueryD3D11Impl.h" +#include "TextureViewD3D11Impl.hpp" +#include "PipelineStateD3D11Impl.hpp" +#include "ShaderResourceBindingD3D11Impl.hpp" +#include "FenceD3D11Impl.hpp" +#include "QueryD3D11Impl.hpp" #include "EngineMemory.h" namespace Diligent diff --git a/Graphics/GraphicsEngineD3D11/src/SamplerD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/SamplerD3D11Impl.cpp index c5166c27..6d23f951 100644 --- a/Graphics/GraphicsEngineD3D11/src/SamplerD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/SamplerD3D11Impl.cpp @@ -26,8 +26,8 @@ */ #include "pch.h" -#include "SamplerD3D11Impl.h" -#include "RenderDeviceD3D11Impl.h" +#include "SamplerD3D11Impl.hpp" +#include "RenderDeviceD3D11Impl.hpp" #include "D3D11TypeConversions.h" namespace Diligent diff --git a/Graphics/GraphicsEngineD3D11/src/ShaderD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/ShaderD3D11Impl.cpp index 8cf31521..b5b0194f 100644 --- a/Graphics/GraphicsEngineD3D11/src/ShaderD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/ShaderD3D11Impl.cpp @@ -27,8 +27,8 @@ #include "pch.h" -#include "ShaderD3D11Impl.h" -#include "RenderDeviceD3D11Impl.h" +#include "ShaderD3D11Impl.hpp" +#include "RenderDeviceD3D11Impl.hpp" #include "ResourceMapping.h" namespace Diligent diff --git a/Graphics/GraphicsEngineD3D11/src/ShaderResourceBindingD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/ShaderResourceBindingD3D11Impl.cpp index 96acdd01..7af06af3 100644 --- a/Graphics/GraphicsEngineD3D11/src/ShaderResourceBindingD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/ShaderResourceBindingD3D11Impl.cpp @@ -26,10 +26,10 @@ */ #include "pch.h" -#include "ShaderResourceBindingD3D11Impl.h" -#include "PipelineStateD3D11Impl.h" -#include "DeviceContextD3D11Impl.h" -#include "RenderDeviceD3D11Impl.h" +#include "ShaderResourceBindingD3D11Impl.hpp" +#include "PipelineStateD3D11Impl.hpp" +#include "DeviceContextD3D11Impl.hpp" +#include "RenderDeviceD3D11Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/src/ShaderResourceCacheD3D11.cpp b/Graphics/GraphicsEngineD3D11/src/ShaderResourceCacheD3D11.cpp index a98653eb..2286d65e 100755 --- a/Graphics/GraphicsEngineD3D11/src/ShaderResourceCacheD3D11.cpp +++ b/Graphics/GraphicsEngineD3D11/src/ShaderResourceCacheD3D11.cpp @@ -27,11 +27,11 @@ #include "pch.h"
-#include "ShaderResourceCacheD3D11.h"
-#include "ShaderResourceLayoutD3D11.h"
-#include "TextureBaseD3D11.h"
-#include "BufferD3D11Impl.h"
-#include "SamplerD3D11Impl.h"
+#include "ShaderResourceCacheD3D11.hpp"
+#include "ShaderResourceLayoutD3D11.hpp"
+#include "TextureBaseD3D11.hpp"
+#include "BufferD3D11Impl.hpp"
+#include "SamplerD3D11Impl.hpp"
#include "MemoryAllocator.h"
namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D11/src/ShaderResourceLayoutD3D11.cpp b/Graphics/GraphicsEngineD3D11/src/ShaderResourceLayoutD3D11.cpp index c13f6fd8..741b5692 100755 --- a/Graphics/GraphicsEngineD3D11/src/ShaderResourceLayoutD3D11.cpp +++ b/Graphics/GraphicsEngineD3D11/src/ShaderResourceLayoutD3D11.cpp @@ -29,15 +29,15 @@ #include <d3dcompiler.h>
-#include "ShaderResourceLayoutD3D11.h"
-#include "ShaderResourceCacheD3D11.h"
-#include "BufferD3D11Impl.h"
-#include "BufferViewD3D11Impl.h"
-#include "TextureBaseD3D11.h"
+#include "ShaderResourceLayoutD3D11.hpp"
+#include "ShaderResourceCacheD3D11.hpp"
+#include "BufferD3D11Impl.hpp"
+#include "BufferViewD3D11Impl.hpp"
+#include "TextureBaseD3D11.hpp"
#include "TextureViewD3D11.h"
-#include "SamplerD3D11Impl.h"
-#include "ShaderD3D11Impl.h"
-#include "ShaderResourceVariableBase.h"
+#include "SamplerD3D11Impl.hpp"
+#include "ShaderD3D11Impl.hpp"
+#include "ShaderResourceVariableBase.hpp"
namespace Diligent
{
diff --git a/Graphics/GraphicsEngineD3D11/src/ShaderResourcesD3D11.cpp b/Graphics/GraphicsEngineD3D11/src/ShaderResourcesD3D11.cpp index 6ca61897..e39830aa 100755 --- a/Graphics/GraphicsEngineD3D11/src/ShaderResourcesD3D11.cpp +++ b/Graphics/GraphicsEngineD3D11/src/ShaderResourcesD3D11.cpp @@ -28,10 +28,10 @@ #include "pch.h"
#include <d3dcompiler.h>
-#include "ShaderResourcesD3D11.h"
-#include "ShaderBase.h"
-#include "ShaderResourceCacheD3D11.h"
-#include "RenderDeviceD3D11Impl.h"
+#include "ShaderResourcesD3D11.hpp"
+#include "ShaderBase.hpp"
+#include "ShaderResourceCacheD3D11.hpp"
+#include "RenderDeviceD3D11Impl.hpp"
namespace Diligent
{
diff --git a/Graphics/GraphicsEngineD3D11/src/SwapChainD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/SwapChainD3D11Impl.cpp index 537064e5..0beb5eb8 100644 --- a/Graphics/GraphicsEngineD3D11/src/SwapChainD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/SwapChainD3D11Impl.cpp @@ -26,9 +26,9 @@ */ #include "pch.h" -#include "SwapChainD3D11Impl.h" -#include "RenderDeviceD3D11Impl.h" -#include "DeviceContextD3D11Impl.h" +#include "SwapChainD3D11Impl.hpp" +#include "RenderDeviceD3D11Impl.hpp" +#include "DeviceContextD3D11Impl.hpp" #include <dxgi1_2.h> namespace Diligent diff --git a/Graphics/GraphicsEngineD3D11/src/Texture1D_D3D11.cpp b/Graphics/GraphicsEngineD3D11/src/Texture1D_D3D11.cpp index 7f7b63cc..89104a55 100644 --- a/Graphics/GraphicsEngineD3D11/src/Texture1D_D3D11.cpp +++ b/Graphics/GraphicsEngineD3D11/src/Texture1D_D3D11.cpp @@ -26,8 +26,8 @@ */ #include "pch.h" -#include "Texture1D_D3D11.h" -#include "RenderDeviceD3D11Impl.h" +#include "Texture1D_D3D11.hpp" +#include "RenderDeviceD3D11Impl.hpp" #include "D3D11TypeConversions.h" namespace Diligent diff --git a/Graphics/GraphicsEngineD3D11/src/Texture2D_D3D11.cpp b/Graphics/GraphicsEngineD3D11/src/Texture2D_D3D11.cpp index 2deb84cc..cc36b713 100644 --- a/Graphics/GraphicsEngineD3D11/src/Texture2D_D3D11.cpp +++ b/Graphics/GraphicsEngineD3D11/src/Texture2D_D3D11.cpp @@ -26,8 +26,8 @@ */ #include "pch.h" -#include "Texture2D_D3D11.h" -#include "RenderDeviceD3D11Impl.h" +#include "Texture2D_D3D11.hpp" +#include "RenderDeviceD3D11Impl.hpp" #include "D3D11TypeConversions.h" namespace Diligent diff --git a/Graphics/GraphicsEngineD3D11/src/Texture3D_D3D11.cpp b/Graphics/GraphicsEngineD3D11/src/Texture3D_D3D11.cpp index 37ad78a9..322043e8 100644 --- a/Graphics/GraphicsEngineD3D11/src/Texture3D_D3D11.cpp +++ b/Graphics/GraphicsEngineD3D11/src/Texture3D_D3D11.cpp @@ -26,8 +26,8 @@ */ #include "pch.h" -#include "Texture3D_D3D11.h" -#include "RenderDeviceD3D11Impl.h" +#include "Texture3D_D3D11.hpp" +#include "RenderDeviceD3D11Impl.hpp" #include "D3D11TypeConversions.h" namespace Diligent diff --git a/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp b/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp index add54b6b..39918856 100644 --- a/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp +++ b/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp @@ -26,11 +26,11 @@ */ #include "pch.h" -#include "TextureBaseD3D11.h" -#include "RenderDeviceD3D11Impl.h" -#include "DeviceContextD3D11Impl.h" +#include "TextureBaseD3D11.hpp" +#include "RenderDeviceD3D11Impl.hpp" +#include "DeviceContextD3D11Impl.hpp" #include "D3D11TypeConversions.h" -#include "TextureViewD3D11Impl.h" +#include "TextureViewD3D11Impl.hpp" #include "EngineMemory.h" namespace Diligent diff --git a/Graphics/GraphicsEngineD3D11/src/TextureViewD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/TextureViewD3D11Impl.cpp index 6dc63f6a..f6c2d982 100644 --- a/Graphics/GraphicsEngineD3D11/src/TextureViewD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/TextureViewD3D11Impl.cpp @@ -26,8 +26,8 @@ */ #include "pch.h" -#include "TextureViewD3D11Impl.h" -#include "DeviceContextD3D11Impl.h" +#include "TextureViewD3D11Impl.hpp" +#include "DeviceContextD3D11Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/CMakeLists.txt b/Graphics/GraphicsEngineD3D12/CMakeLists.txt index a8b744e8..fa3b4b70 100644 --- a/Graphics/GraphicsEngineD3D12/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3D12/CMakeLists.txt @@ -3,38 +3,38 @@ cmake_minimum_required (VERSION 3.10) project(Diligent-GraphicsEngineD3D12 CXX) set(INCLUDE - include/BufferD3D12Impl.h - include/BufferViewD3D12Impl.h - include/CommandContext.h - include/CommandListD3D12Impl.h - include/CommandListManager.h - include/CommandQueueD3D12Impl.h - include/D3D12ResourceBase.h + include/BufferD3D12Impl.hpp + include/BufferViewD3D12Impl.hpp + include/CommandContext.hpp + include/CommandListD3D12Impl.hpp + include/CommandListManager.hpp + include/CommandQueueD3D12Impl.hpp + include/D3D12ResourceBase.hpp include/D3D12TypeConversions.h include/D3D12TypeDefinitions.h include/D3D12Utils.h include/d3dx12_win.h - include/DescriptorHeap.h - include/DeviceContextD3D12Impl.h - include/D3D12DynamicHeap.h - include/FenceD3D12Impl.h - include/GenerateMips.h + include/DescriptorHeap.hpp + include/DeviceContextD3D12Impl.hpp + include/D3D12DynamicHeap.hpp + include/FenceD3D12Impl.hpp + include/GenerateMips.hpp include/pch.h - include/PipelineStateD3D12Impl.h - include/QueryD3D12Impl.h - include/QueryManagerD3D12.h - include/RenderDeviceD3D12Impl.h - include/RootSignature.h - include/SamplerD3D12Impl.h - include/ShaderD3D12Impl.h - include/ShaderResourceBindingD3D12Impl.h - include/ShaderResourceCacheD3D12.h - include/ShaderResourceLayoutD3D12.h - include/ShaderResourcesD3D12.h - include/ShaderVariableD3D12.h - include/SwapChainD3D12Impl.h - include/TextureD3D12Impl.h - include/TextureViewD3D12Impl.h + include/PipelineStateD3D12Impl.hpp + include/QueryD3D12Impl.hpp + include/QueryManagerD3D12.hpp + include/RenderDeviceD3D12Impl.hpp + include/RootSignature.hpp + include/SamplerD3D12Impl.hpp + include/ShaderD3D12Impl.hpp + include/ShaderResourceBindingD3D12Impl.hpp + include/ShaderResourceCacheD3D12.hpp + include/ShaderResourceLayoutD3D12.hpp + include/ShaderResourcesD3D12.hpp + include/ShaderVariableD3D12.hpp + include/SwapChainD3D12Impl.hpp + include/TextureD3D12Impl.hpp + include/TextureViewD3D12Impl.hpp ) set(INTERFACE @@ -88,7 +88,7 @@ set(SRC ) if(PLATFORM_WIN32) - list(APPEND INCLUDE include/D3D12Loader.h) + list(APPEND INCLUDE include/D3D12Loader.hpp) list(APPEND SRC src/D3D12Loader.cpp) set(USE_D3D12_LOADER 1) else() diff --git a/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.hpp index adb24766..70513071 100644 --- a/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.h +++ b/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.hpp @@ -32,11 +32,11 @@ #include "BufferD3D12.h" #include "RenderDeviceD3D12.h" -#include "BufferBase.h" -#include "BufferViewD3D12Impl.h" -#include "D3D12ResourceBase.h" -#include "D3D12DynamicHeap.h" -#include "RenderDeviceD3D12Impl.h" +#include "BufferBase.hpp" +#include "BufferViewD3D12Impl.hpp" +#include "D3D12ResourceBase.hpp" +#include "D3D12DynamicHeap.hpp" +#include "RenderDeviceD3D12Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp index abf715eb..62cb6294 100644 --- a/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.h +++ b/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp @@ -32,9 +32,9 @@ #include "BufferViewD3D12.h" #include "RenderDeviceD3D12.h" -#include "BufferViewBase.h" -#include "DescriptorHeap.h" -#include "RenderDeviceD3D12Impl.h" +#include "BufferViewBase.hpp" +#include "DescriptorHeap.hpp" +#include "RenderDeviceD3D12Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/include/CommandContext.h b/Graphics/GraphicsEngineD3D12/include/CommandContext.hpp index ed8824c5..30134445 100644 --- a/Graphics/GraphicsEngineD3D12/include/CommandContext.h +++ b/Graphics/GraphicsEngineD3D12/include/CommandContext.hpp @@ -30,11 +30,11 @@ #include <vector> -#include "D3D12ResourceBase.h" +#include "D3D12ResourceBase.hpp" #include "TextureViewD3D12.h" #include "TextureD3D12.h" #include "BufferD3D12.h" -#include "DescriptorHeap.h" +#include "DescriptorHeap.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/include/CommandListD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/CommandListD3D12Impl.hpp index 4066dc63..47319ded 100644 --- a/Graphics/GraphicsEngineD3D12/include/CommandListD3D12Impl.h +++ b/Graphics/GraphicsEngineD3D12/include/CommandListD3D12Impl.hpp @@ -30,8 +30,8 @@ /// \file /// Declaration of Diligent::CommandListD3D12Impl class -#include "CommandListBase.h" -#include "RenderDeviceD3D12Impl.h" +#include "CommandListBase.hpp" +#include "RenderDeviceD3D12Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/include/CommandListManager.h b/Graphics/GraphicsEngineD3D12/include/CommandListManager.hpp index 6548a637..6548a637 100644 --- a/Graphics/GraphicsEngineD3D12/include/CommandListManager.h +++ b/Graphics/GraphicsEngineD3D12/include/CommandListManager.hpp diff --git a/Graphics/GraphicsEngineD3D12/include/CommandQueueD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/CommandQueueD3D12Impl.hpp index 478f5139..478f5139 100644 --- a/Graphics/GraphicsEngineD3D12/include/CommandQueueD3D12Impl.h +++ b/Graphics/GraphicsEngineD3D12/include/CommandQueueD3D12Impl.hpp diff --git a/Graphics/GraphicsEngineD3D12/include/D3D12DynamicHeap.h b/Graphics/GraphicsEngineD3D12/include/D3D12DynamicHeap.hpp index cc0b1a9e..cc0b1a9e 100644 --- a/Graphics/GraphicsEngineD3D12/include/D3D12DynamicHeap.h +++ b/Graphics/GraphicsEngineD3D12/include/D3D12DynamicHeap.hpp diff --git a/Graphics/GraphicsEngineD3D12/include/D3D12Loader.h b/Graphics/GraphicsEngineD3D12/include/D3D12Loader.hpp index 8e5b346d..8e5b346d 100644 --- a/Graphics/GraphicsEngineD3D12/include/D3D12Loader.h +++ b/Graphics/GraphicsEngineD3D12/include/D3D12Loader.hpp diff --git a/Graphics/GraphicsEngineD3D12/include/D3D12ResourceBase.h b/Graphics/GraphicsEngineD3D12/include/D3D12ResourceBase.hpp index 240ea165..240ea165 100644 --- a/Graphics/GraphicsEngineD3D12/include/D3D12ResourceBase.h +++ b/Graphics/GraphicsEngineD3D12/include/D3D12ResourceBase.hpp diff --git a/Graphics/GraphicsEngineD3D12/include/DescriptorHeap.h b/Graphics/GraphicsEngineD3D12/include/DescriptorHeap.hpp index d8108c06..d8108c06 100644 --- a/Graphics/GraphicsEngineD3D12/include/DescriptorHeap.h +++ b/Graphics/GraphicsEngineD3D12/include/DescriptorHeap.hpp diff --git a/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.hpp index 2253dbc2..6971d8a8 100644 --- a/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.h +++ b/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.hpp @@ -34,11 +34,11 @@ #include "DeviceContextD3D12.h" #include "DeviceContextNextGenBase.h" -#include "BufferD3D12Impl.h" -#include "TextureD3D12Impl.h" -#include "QueryD3D12Impl.h" -#include "PipelineStateD3D12Impl.h" -#include "D3D12DynamicHeap.h" +#include "BufferD3D12Impl.hpp" +#include "TextureD3D12Impl.hpp" +#include "QueryD3D12Impl.hpp" +#include "PipelineStateD3D12Impl.hpp" +#include "D3D12DynamicHeap.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp index cacc1e11..1549e584 100644 --- a/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.h +++ b/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp @@ -32,8 +32,8 @@ #include "FenceD3D12.h" #include "RenderDeviceD3D12.h" -#include "FenceBase.h" -#include "RenderDeviceD3D12Impl.h" +#include "FenceBase.hpp" +#include "RenderDeviceD3D12Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/include/GenerateMips.h b/Graphics/GraphicsEngineD3D12/include/GenerateMips.hpp index a62f9665..a62f9665 100644 --- a/Graphics/GraphicsEngineD3D12/include/GenerateMips.h +++ b/Graphics/GraphicsEngineD3D12/include/GenerateMips.hpp diff --git a/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp index d23d54e1..9431d2f4 100644 --- a/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.h +++ b/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp @@ -32,12 +32,12 @@ #include "RenderDeviceD3D12.h" #include "PipelineStateD3D12.h" -#include "PipelineStateBase.h" -#include "RootSignature.h" -#include "ShaderResourceLayoutD3D12.h" +#include "PipelineStateBase.hpp" +#include "RootSignature.hpp" +#include "ShaderResourceLayoutD3D12.hpp" #include "SRBMemoryAllocator.hpp" -#include "RenderDeviceD3D12Impl.h" -#include "ShaderVariableD3D12.h" +#include "RenderDeviceD3D12Impl.hpp" +#include "ShaderVariableD3D12.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.hpp index 0c47565e..129e0307 100644 --- a/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.h +++ b/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.hpp @@ -31,8 +31,8 @@ /// Declaration of Diligent::QueryD3D12Impl class #include "QueryD3D12.h" -#include "QueryBase.h" -#include "RenderDeviceD3D12Impl.h" +#include "QueryBase.hpp" +#include "RenderDeviceD3D12Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/include/QueryManagerD3D12.h b/Graphics/GraphicsEngineD3D12/include/QueryManagerD3D12.hpp index 13337696..13337696 100644 --- a/Graphics/GraphicsEngineD3D12/include/QueryManagerD3D12.h +++ b/Graphics/GraphicsEngineD3D12/include/QueryManagerD3D12.hpp diff --git a/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.hpp index 922a4c22..3c4746c8 100644 --- a/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.h +++ b/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.hpp @@ -30,16 +30,16 @@ /// \file /// Declaration of Diligent::RenderDeviceD3D12Impl class #include "RenderDeviceD3D12.h" -#include "RenderDeviceD3DBase.h" +#include "RenderDeviceD3DBase.hpp" #include "RenderDeviceNextGenBase.h" -#include "DescriptorHeap.h" -#include "CommandListManager.h" -#include "CommandContext.h" -#include "D3D12DynamicHeap.h" +#include "DescriptorHeap.hpp" +#include "CommandListManager.hpp" +#include "CommandContext.hpp" +#include "D3D12DynamicHeap.hpp" #include "Atomics.h" #include "CommandQueueD3D12.h" -#include "GenerateMips.h" -#include "QueryManagerD3D12.h" +#include "GenerateMips.hpp" +#include "QueryManagerD3D12.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/include/RootSignature.h b/Graphics/GraphicsEngineD3D12/include/RootSignature.hpp index fd2aff02..e723896a 100644 --- a/Graphics/GraphicsEngineD3D12/include/RootSignature.h +++ b/Graphics/GraphicsEngineD3D12/include/RootSignature.hpp @@ -30,9 +30,9 @@ /// \file /// Declaration of Diligent::RootSignature class #include <array> -#include "ShaderD3DBase.h" -#include "ShaderResourceLayoutD3D12.h" -#include "BufferD3D12Impl.h" +#include "ShaderD3DBase.hpp" +#include "ShaderResourceLayoutD3D12.hpp" +#include "BufferD3D12Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp index c52f7c17..5633b5dc 100644 --- a/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.h +++ b/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp @@ -32,9 +32,9 @@ #include "SamplerD3D12.h" #include "RenderDeviceD3D12.h" -#include "SamplerBase.h" -#include "DescriptorHeap.h" -#include "RenderDeviceD3D12Impl.h" +#include "SamplerBase.hpp" +#include "DescriptorHeap.hpp" +#include "RenderDeviceD3D12Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp index a5be1a03..6eb8e5d8 100644 --- a/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.h +++ b/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp @@ -32,11 +32,11 @@ #include "RenderDeviceD3D12.h" #include "ShaderD3D12.h" -#include "ShaderBase.h" -#include "ShaderD3DBase.h" -#include "ShaderResourceLayoutD3D12.h" -#include "RenderDeviceD3D12Impl.h" -#include "ShaderVariableD3D12.h" +#include "ShaderBase.hpp" +#include "ShaderD3DBase.hpp" +#include "ShaderResourceLayoutD3D12.hpp" +#include "RenderDeviceD3D12Impl.hpp" +#include "ShaderVariableD3D12.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderResourceBindingD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/ShaderResourceBindingD3D12Impl.hpp index c89a31e7..2fde8ed1 100644 --- a/Graphics/GraphicsEngineD3D12/include/ShaderResourceBindingD3D12Impl.h +++ b/Graphics/GraphicsEngineD3D12/include/ShaderResourceBindingD3D12Impl.hpp @@ -32,11 +32,11 @@ #include "ShaderResourceBindingD3D12.h" #include "RenderDeviceD3D12.h" -#include "ShaderResourceBindingBase.h" -#include "ShaderBase.h" -#include "ShaderResourceCacheD3D12.h" -#include "ShaderResourceLayoutD3D12.h" -#include "ShaderVariableD3D12.h" +#include "ShaderResourceBindingBase.hpp" +#include "ShaderBase.hpp" +#include "ShaderResourceCacheD3D12.hpp" +#include "ShaderResourceLayoutD3D12.hpp" +#include "ShaderVariableD3D12.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.h b/Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.hpp index 692214dc..9f24d2d4 100644 --- a/Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.h +++ b/Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.hpp @@ -83,7 +83,7 @@ // ..... | DescrptHndl[0] ... DescrptHndl[n-1] | .... // -#include "DescriptorHeap.h" +#include "DescriptorHeap.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderResourceLayoutD3D12.h b/Graphics/GraphicsEngineD3D12/include/ShaderResourceLayoutD3D12.hpp index 75c2837f..56889271 100644 --- a/Graphics/GraphicsEngineD3D12/include/ShaderResourceLayoutD3D12.h +++ b/Graphics/GraphicsEngineD3D12/include/ShaderResourceLayoutD3D12.hpp @@ -100,9 +100,9 @@ #include <array> -#include "ShaderBase.h" -#include "ShaderResourcesD3D12.h" -#include "ShaderResourceCacheD3D12.h" +#include "ShaderBase.hpp" +#include "ShaderResourcesD3D12.hpp" +#include "ShaderResourceCacheD3D12.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderResourcesD3D12.h b/Graphics/GraphicsEngineD3D12/include/ShaderResourcesD3D12.hpp index e9672d10..23f9882b 100644 --- a/Graphics/GraphicsEngineD3D12/include/ShaderResourcesD3D12.h +++ b/Graphics/GraphicsEngineD3D12/include/ShaderResourcesD3D12.hpp @@ -82,7 +82,7 @@ // |____________________________| |___________________________| // -#include "ShaderResources.h" +#include "ShaderResources.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderVariableD3D12.h b/Graphics/GraphicsEngineD3D12/include/ShaderVariableD3D12.hpp index f7a1f8c8..749de7f2 100644 --- a/Graphics/GraphicsEngineD3D12/include/ShaderVariableD3D12.h +++ b/Graphics/GraphicsEngineD3D12/include/ShaderVariableD3D12.hpp @@ -64,8 +64,8 @@ #include <memory> #include "ShaderResourceVariableD3D.h" -#include "ShaderResourceLayoutD3D12.h" -#include "ShaderResourceVariableBase.h" +#include "ShaderResourceLayoutD3D12.hpp" +#include "ShaderResourceVariableBase.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/include/SwapChainD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/SwapChainD3D12Impl.hpp index 1b833029..0c45d915 100644 --- a/Graphics/GraphicsEngineD3D12/include/SwapChainD3D12Impl.h +++ b/Graphics/GraphicsEngineD3D12/include/SwapChainD3D12Impl.hpp @@ -32,7 +32,7 @@ #include <dxgi1_4.h> #include "SwapChainD3D12.h" -#include "SwapChainD3DBase.h" +#include "SwapChainD3DBase.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/include/TextureD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/TextureD3D12Impl.hpp index a4ab0b08..7c1c041b 100644 --- a/Graphics/GraphicsEngineD3D12/include/TextureD3D12Impl.h +++ b/Graphics/GraphicsEngineD3D12/include/TextureD3D12Impl.hpp @@ -32,10 +32,10 @@ #include "TextureD3D12.h" #include "RenderDeviceD3D12.h" -#include "TextureBase.h" -#include "TextureViewD3D12Impl.h" -#include "D3D12ResourceBase.h" -#include "RenderDeviceD3D12Impl.h" +#include "TextureBase.hpp" +#include "TextureViewD3D12Impl.hpp" +#include "D3D12ResourceBase.hpp" +#include "RenderDeviceD3D12Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp index fb8b7499..2c2529ae 100644 --- a/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.h +++ b/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp @@ -32,9 +32,9 @@ #include "TextureViewD3D12.h" #include "RenderDeviceD3D12.h" -#include "TextureViewBase.h" -#include "DescriptorHeap.h" -#include "RenderDeviceD3D12Impl.h" +#include "TextureViewBase.hpp" +#include "DescriptorHeap.hpp" +#include "RenderDeviceD3D12Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/include/pch.h b/Graphics/GraphicsEngineD3D12/include/pch.h index 101ffbdf..1554e6f6 100644 --- a/Graphics/GraphicsEngineD3D12/include/pch.h +++ b/Graphics/GraphicsEngineD3D12/include/pch.h @@ -50,13 +50,13 @@ #include "Errors.h" #include "RefCntAutoPtr.h" #include "DebugUtilities.h" -#include "D3DErrors.h" -#include "RenderDeviceBase.h" +#include "D3DErrors.hpp" +#include "RenderDeviceBase.hpp" #include "ValidatedCast.h" #include <atlcomcli.h> #if USE_D3D12_LOADER // On Win32 we manually load d3d12.dll and get entry points, // but UWP does not support that, so we link with d3d12.lib -# include "D3D12Loader.h" +# include "D3D12Loader.hpp" #endif diff --git a/Graphics/GraphicsEngineD3D12/src/BufferD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/BufferD3D12Impl.cpp index dc23ff41..876a8bac 100644 --- a/Graphics/GraphicsEngineD3D12/src/BufferD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/BufferD3D12Impl.cpp @@ -26,11 +26,11 @@ */ #include "pch.h" -#include "BufferD3D12Impl.h" -#include "RenderDeviceD3D12Impl.h" -#include "DeviceContextD3D12Impl.h" +#include "BufferD3D12Impl.hpp" +#include "RenderDeviceD3D12Impl.hpp" +#include "DeviceContextD3D12Impl.hpp" #include "D3D12TypeConversions.h" -#include "BufferViewD3D12Impl.h" +#include "BufferViewD3D12Impl.hpp" #include "GraphicsAccessories.hpp" #include "DXGITypeConversions.h" #include "EngineMemory.h" diff --git a/Graphics/GraphicsEngineD3D12/src/BufferViewD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/BufferViewD3D12Impl.cpp index 1b394931..731d4da2 100644 --- a/Graphics/GraphicsEngineD3D12/src/BufferViewD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/BufferViewD3D12Impl.cpp @@ -26,7 +26,7 @@ */ #include "pch.h" -#include "BufferViewD3D12Impl.h" +#include "BufferViewD3D12Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/src/CommandContext.cpp b/Graphics/GraphicsEngineD3D12/src/CommandContext.cpp index 2dbb5190..ebc46582 100644 --- a/Graphics/GraphicsEngineD3D12/src/CommandContext.cpp +++ b/Graphics/GraphicsEngineD3D12/src/CommandContext.cpp @@ -27,10 +27,10 @@ #include "pch.h" #include "d3dx12_win.h" -#include "CommandContext.h" -#include "TextureD3D12Impl.h" -#include "BufferD3D12Impl.h" -#include "CommandListManager.h" +#include "CommandContext.hpp" +#include "TextureD3D12Impl.hpp" +#include "BufferD3D12Impl.hpp" +#include "CommandListManager.hpp" #include "D3D12TypeConversions.h" diff --git a/Graphics/GraphicsEngineD3D12/src/CommandListManager.cpp b/Graphics/GraphicsEngineD3D12/src/CommandListManager.cpp index d1dadddc..53827add 100644 --- a/Graphics/GraphicsEngineD3D12/src/CommandListManager.cpp +++ b/Graphics/GraphicsEngineD3D12/src/CommandListManager.cpp @@ -26,8 +26,8 @@ */ #include "pch.h" -#include "CommandListManager.h" -#include "RenderDeviceD3D12Impl.h" +#include "CommandListManager.hpp" +#include "RenderDeviceD3D12Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/src/CommandQueueD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/CommandQueueD3D12Impl.cpp index 68a7d257..74e65559 100644 --- a/Graphics/GraphicsEngineD3D12/src/CommandQueueD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/CommandQueueD3D12Impl.cpp @@ -26,7 +26,7 @@ */ #include "pch.h" -#include "CommandQueueD3D12Impl.h" +#include "CommandQueueD3D12Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/src/D3D12DynamicHeap.cpp b/Graphics/GraphicsEngineD3D12/src/D3D12DynamicHeap.cpp index 0c27214a..2c010f84 100644 --- a/Graphics/GraphicsEngineD3D12/src/D3D12DynamicHeap.cpp +++ b/Graphics/GraphicsEngineD3D12/src/D3D12DynamicHeap.cpp @@ -26,8 +26,8 @@ */ #include "pch.h" -#include "D3D12DynamicHeap.h" -#include "RenderDeviceD3D12Impl.h" +#include "D3D12DynamicHeap.hpp" +#include "RenderDeviceD3D12Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/src/D3D12Loader.cpp b/Graphics/GraphicsEngineD3D12/src/D3D12Loader.cpp index f4f56281..f0cf9e3b 100644 --- a/Graphics/GraphicsEngineD3D12/src/D3D12Loader.cpp +++ b/Graphics/GraphicsEngineD3D12/src/D3D12Loader.cpp @@ -26,7 +26,7 @@ */ -#include "D3D12Loader.h" +#include "D3D12Loader.hpp" #include "Errors.h" #ifndef NOMINMAX diff --git a/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp b/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp index e0e8d3f7..dfb01d88 100644 --- a/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp +++ b/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp @@ -33,8 +33,8 @@ #include "DXGITypeConversions.h" #include "D3D12TypeDefinitions.h" -#include "D3DTypeConversionImpl.h" -#include "D3DViewDescConversionImpl.h" +#include "D3DTypeConversionImpl.hpp" +#include "D3DViewDescConversionImpl.hpp" #include "PlatformMisc.h" namespace Diligent diff --git a/Graphics/GraphicsEngineD3D12/src/DescriptorHeap.cpp b/Graphics/GraphicsEngineD3D12/src/DescriptorHeap.cpp index 39d9d119..be598856 100644 --- a/Graphics/GraphicsEngineD3D12/src/DescriptorHeap.cpp +++ b/Graphics/GraphicsEngineD3D12/src/DescriptorHeap.cpp @@ -26,8 +26,8 @@ */ #include "pch.h" -#include "DescriptorHeap.h" -#include "RenderDeviceD3D12Impl.h" +#include "DescriptorHeap.hpp" +#include "RenderDeviceD3D12Impl.hpp" #include "D3D12Utils.h" namespace Diligent diff --git a/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp index 51d4c945..ba509cd5 100644 --- a/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp @@ -27,17 +27,17 @@ #include "pch.h" #include <sstream> -#include "RenderDeviceD3D12Impl.h" -#include "DeviceContextD3D12Impl.h" -#include "PipelineStateD3D12Impl.h" -#include "CommandContext.h" -#include "TextureD3D12Impl.h" -#include "BufferD3D12Impl.h" -#include "FenceD3D12Impl.h" +#include "RenderDeviceD3D12Impl.hpp" +#include "DeviceContextD3D12Impl.hpp" +#include "PipelineStateD3D12Impl.hpp" +#include "CommandContext.hpp" +#include "TextureD3D12Impl.hpp" +#include "BufferD3D12Impl.hpp" +#include "FenceD3D12Impl.hpp" #include "D3D12TypeConversions.h" #include "d3dx12_win.h" -#include "D3D12DynamicHeap.h" -#include "CommandListD3D12Impl.h" +#include "D3D12DynamicHeap.hpp" +#include "CommandListD3D12Impl.hpp" #include "DXGITypeConversions.h" namespace Diligent diff --git a/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp index 5b7a555e..77f2805e 100644 --- a/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp +++ b/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp @@ -34,14 +34,14 @@ #include <string> #include "EngineFactoryD3D12.h" -#include "RenderDeviceD3D12Impl.h" -#include "DeviceContextD3D12Impl.h" -#include "SwapChainD3D12Impl.h" +#include "RenderDeviceD3D12Impl.hpp" +#include "DeviceContextD3D12Impl.hpp" +#include "SwapChainD3D12Impl.hpp" #include "D3D12TypeConversions.h" -#include "EngineFactoryD3DBase.h" +#include "EngineFactoryD3DBase.hpp" #include "StringTools.h" #include "EngineMemory.h" -#include "CommandQueueD3D12Impl.h" +#include "CommandQueueD3D12Impl.hpp" #ifndef NOMINMAX # define NOMINMAX diff --git a/Graphics/GraphicsEngineD3D12/src/FenceD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/FenceD3D12Impl.cpp index bf7703cd..a9e1c7d8 100644 --- a/Graphics/GraphicsEngineD3D12/src/FenceD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/FenceD3D12Impl.cpp @@ -29,9 +29,9 @@ #include <thread> #include <atlbase.h> -#include "FenceD3D12Impl.h" +#include "FenceD3D12Impl.hpp" #include "EngineMemory.h" -#include "RenderDeviceD3D12Impl.h" +#include "RenderDeviceD3D12Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/src/GenerateMips.cpp b/Graphics/GraphicsEngineD3D12/src/GenerateMips.cpp index 8518da94..be5c68eb 100644 --- a/Graphics/GraphicsEngineD3D12/src/GenerateMips.cpp +++ b/Graphics/GraphicsEngineD3D12/src/GenerateMips.cpp @@ -45,11 +45,11 @@ #include "pch.h" #include "d3dx12_win.h" -#include "RenderDeviceD3D12Impl.h" -#include "GenerateMips.h" -#include "CommandContext.h" -#include "TextureViewD3D12Impl.h" -#include "TextureD3D12Impl.h" +#include "RenderDeviceD3D12Impl.hpp" +#include "GenerateMips.hpp" +#include "CommandContext.hpp" +#include "TextureViewD3D12Impl.hpp" +#include "TextureD3D12Impl.hpp" #include "GenerateMips/GenerateMipsLinearCS.h" #include "GenerateMips/GenerateMipsLinearOddCS.h" diff --git a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp index 5d3c022b..ce1e2dc6 100644 --- a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp @@ -27,16 +27,16 @@ #include "pch.h" #include <array> -#include "PipelineStateD3D12Impl.h" -#include "ShaderD3D12Impl.h" +#include "PipelineStateD3D12Impl.hpp" +#include "ShaderD3D12Impl.hpp" #include "D3D12TypeConversions.h" -#include "RenderDeviceD3D12Impl.h" +#include "RenderDeviceD3D12Impl.hpp" #include "DXGITypeConversions.h" -#include "ShaderResourceBindingD3D12Impl.h" -#include "CommandContext.h" +#include "ShaderResourceBindingD3D12Impl.hpp" +#include "CommandContext.hpp" #include "EngineMemory.h" #include "StringTools.h" -#include "ShaderVariableD3D12.h" +#include "ShaderVariableD3D12.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/src/QueryD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/QueryD3D12Impl.cpp index 2dd1a299..e7b5c1ee 100644 --- a/Graphics/GraphicsEngineD3D12/src/QueryD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/QueryD3D12Impl.cpp @@ -28,10 +28,10 @@ #include "pch.h" #include <atlbase.h> -#include "QueryD3D12Impl.h" -#include "RenderDeviceD3D12Impl.h" +#include "QueryD3D12Impl.hpp" +#include "RenderDeviceD3D12Impl.hpp" #include "GraphicsAccessories.hpp" -#include "DeviceContextD3D12Impl.h" +#include "DeviceContextD3D12Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/src/QueryManagerD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/QueryManagerD3D12.cpp index 4f542448..c8fd5110 100644 --- a/Graphics/GraphicsEngineD3D12/src/QueryManagerD3D12.cpp +++ b/Graphics/GraphicsEngineD3D12/src/QueryManagerD3D12.cpp @@ -28,10 +28,10 @@ #include "pch.h" #include <algorithm> -#include "QueryManagerD3D12.h" +#include "QueryManagerD3D12.hpp" #include "D3D12TypeConversions.h" #include "GraphicsAccessories.hpp" -#include "CommandContext.h" +#include "CommandContext.hpp" #include "Align.h" namespace Diligent diff --git a/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp index 4b1474d7..73be3632 100644 --- a/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp @@ -27,17 +27,17 @@ #include "pch.h" #include <dxgi1_4.h> -#include "RenderDeviceD3D12Impl.h" -#include "PipelineStateD3D12Impl.h" -#include "ShaderD3D12Impl.h" -#include "TextureD3D12Impl.h" +#include "RenderDeviceD3D12Impl.hpp" +#include "PipelineStateD3D12Impl.hpp" +#include "ShaderD3D12Impl.hpp" +#include "TextureD3D12Impl.hpp" #include "DXGITypeConversions.h" -#include "SamplerD3D12Impl.h" -#include "BufferD3D12Impl.h" -#include "ShaderResourceBindingD3D12Impl.h" -#include "DeviceContextD3D12Impl.h" -#include "FenceD3D12Impl.h" -#include "QueryD3D12Impl.h" +#include "SamplerD3D12Impl.hpp" +#include "BufferD3D12Impl.hpp" +#include "ShaderResourceBindingD3D12Impl.hpp" +#include "DeviceContextD3D12Impl.hpp" +#include "FenceD3D12Impl.hpp" +#include "QueryD3D12Impl.hpp" #include "EngineMemory.h" namespace Diligent diff --git a/Graphics/GraphicsEngineD3D12/src/RootSignature.cpp b/Graphics/GraphicsEngineD3D12/src/RootSignature.cpp index d80983cc..201a5354 100644 --- a/Graphics/GraphicsEngineD3D12/src/RootSignature.cpp +++ b/Graphics/GraphicsEngineD3D12/src/RootSignature.cpp @@ -27,12 +27,12 @@ #include "pch.h" -#include "RootSignature.h" -#include "ShaderResourceLayoutD3D12.h" -#include "ShaderD3D12Impl.h" -#include "CommandContext.h" -#include "RenderDeviceD3D12Impl.h" -#include "TextureD3D12Impl.h" +#include "RootSignature.hpp" +#include "ShaderResourceLayoutD3D12.hpp" +#include "ShaderD3D12Impl.hpp" +#include "CommandContext.hpp" +#include "RenderDeviceD3D12Impl.hpp" +#include "TextureD3D12Impl.hpp" #include "D3D12TypeConversions.h" #include "HashUtils.h" diff --git a/Graphics/GraphicsEngineD3D12/src/SamplerD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/SamplerD3D12Impl.cpp index 0c654cc7..e53fa1b5 100644 --- a/Graphics/GraphicsEngineD3D12/src/SamplerD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/SamplerD3D12Impl.cpp @@ -26,8 +26,8 @@ */ #include "pch.h" -#include "SamplerD3D12Impl.h" -#include "RenderDeviceD3D12Impl.h" +#include "SamplerD3D12Impl.hpp" +#include "RenderDeviceD3D12Impl.hpp" #include "D3D12TypeConversions.h" namespace Diligent diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderD3D12Impl.cpp index 89850809..e9729b80 100644 --- a/Graphics/GraphicsEngineD3D12/src/ShaderD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/ShaderD3D12Impl.cpp @@ -29,8 +29,8 @@ #include <D3Dcompiler.h> -#include "ShaderD3D12Impl.h" -#include "RenderDeviceD3D12Impl.h" +#include "ShaderD3D12Impl.hpp" +#include "RenderDeviceD3D12Impl.hpp" #include "DataBlobImpl.h" namespace Diligent diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderResourceBindingD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderResourceBindingD3D12Impl.cpp index 5ac1f492..93d444d7 100644 --- a/Graphics/GraphicsEngineD3D12/src/ShaderResourceBindingD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/ShaderResourceBindingD3D12Impl.cpp @@ -26,10 +26,10 @@ */ #include "pch.h" -#include "ShaderResourceBindingD3D12Impl.h" -#include "PipelineStateD3D12Impl.h" -#include "ShaderD3D12Impl.h" -#include "RenderDeviceD3D12Impl.h" +#include "ShaderResourceBindingD3D12Impl.hpp" +#include "PipelineStateD3D12Impl.hpp" +#include "ShaderD3D12Impl.hpp" +#include "RenderDeviceD3D12Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderResourceCacheD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderResourceCacheD3D12.cpp index a6679231..482443a7 100644 --- a/Graphics/GraphicsEngineD3D12/src/ShaderResourceCacheD3D12.cpp +++ b/Graphics/GraphicsEngineD3D12/src/ShaderResourceCacheD3D12.cpp @@ -27,8 +27,8 @@ #include "pch.h" -#include "ShaderResourceCacheD3D12.h" -#include "BufferD3D12Impl.h" +#include "ShaderResourceCacheD3D12.hpp" +#include "BufferD3D12Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderResourceLayoutD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderResourceLayoutD3D12.cpp index 8316ff5e..ce7c81f8 100644 --- a/Graphics/GraphicsEngineD3D12/src/ShaderResourceLayoutD3D12.cpp +++ b/Graphics/GraphicsEngineD3D12/src/ShaderResourceLayoutD3D12.cpp @@ -27,17 +27,17 @@ #include "pch.h" -#include "ShaderResourceLayoutD3D12.h" -#include "ShaderResourceCacheD3D12.h" -#include "BufferD3D12Impl.h" +#include "ShaderResourceLayoutD3D12.hpp" +#include "ShaderResourceCacheD3D12.hpp" +#include "BufferD3D12Impl.hpp" #include "BufferViewD3D12.h" -#include "TextureD3D12Impl.h" -#include "TextureViewD3D12Impl.h" -#include "SamplerD3D12Impl.h" -#include "ShaderD3D12Impl.h" -#include "RootSignature.h" -#include "PipelineStateD3D12Impl.h" -#include "ShaderResourceVariableBase.h" +#include "TextureD3D12Impl.hpp" +#include "TextureViewD3D12Impl.hpp" +#include "SamplerD3D12Impl.hpp" +#include "ShaderD3D12Impl.hpp" +#include "RootSignature.hpp" +#include "PipelineStateD3D12Impl.hpp" +#include "ShaderResourceVariableBase.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp index f9a67288..edf818cc 100644 --- a/Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp +++ b/Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp @@ -28,9 +28,9 @@ #include "pch.h" #include <d3dcompiler.h> -#include "ShaderResourcesD3D12.h" -#include "ShaderD3DBase.h" -#include "ShaderBase.h" +#include "ShaderResourcesD3D12.hpp" +#include "ShaderD3DBase.hpp" +#include "ShaderBase.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderVariableD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderVariableD3D12.cpp index ecdf2bc7..1c825a15 100644 --- a/Graphics/GraphicsEngineD3D12/src/ShaderVariableD3D12.cpp +++ b/Graphics/GraphicsEngineD3D12/src/ShaderVariableD3D12.cpp @@ -27,8 +27,8 @@ #include "pch.h" -#include "ShaderVariableD3D12.h" -#include "ShaderResourceVariableBase.h" +#include "ShaderVariableD3D12.hpp" +#include "ShaderResourceVariableBase.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/src/SwapChainD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/SwapChainD3D12Impl.cpp index 531bf4c1..ac24533c 100644 --- a/Graphics/GraphicsEngineD3D12/src/SwapChainD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/SwapChainD3D12Impl.cpp @@ -26,11 +26,11 @@ */ #include "pch.h" -#include "SwapChainD3D12Impl.h" -#include "RenderDeviceD3D12Impl.h" -#include "DeviceContextD3D12Impl.h" +#include "SwapChainD3D12Impl.hpp" +#include "RenderDeviceD3D12Impl.hpp" +#include "DeviceContextD3D12Impl.hpp" #include "DXGITypeConversions.h" -#include "TextureD3D12Impl.h" +#include "TextureD3D12Impl.hpp" #include "EngineMemory.h" namespace Diligent diff --git a/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp index be64e1db..90a583cc 100644 --- a/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp @@ -26,11 +26,11 @@ */ #include "pch.h" -#include "TextureD3D12Impl.h" -#include "RenderDeviceD3D12Impl.h" -#include "DeviceContextD3D12Impl.h" +#include "TextureD3D12Impl.hpp" +#include "RenderDeviceD3D12Impl.hpp" +#include "DeviceContextD3D12Impl.hpp" #include "D3D12TypeConversions.h" -#include "TextureViewD3D12Impl.h" +#include "TextureViewD3D12Impl.hpp" #include "DXGITypeConversions.h" #include "d3dx12_win.h" #include "EngineMemory.h" diff --git a/Graphics/GraphicsEngineD3D12/src/TextureViewD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/TextureViewD3D12Impl.cpp index dc871bf6..d1287c57 100644 --- a/Graphics/GraphicsEngineD3D12/src/TextureViewD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/TextureViewD3D12Impl.cpp @@ -26,8 +26,8 @@ */ #include "pch.h" -#include "TextureViewD3D12Impl.h" -#include "DeviceContextD3D12Impl.h" +#include "TextureViewD3D12Impl.hpp" +#include "DeviceContextD3D12Impl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3DBase/CMakeLists.txt b/Graphics/GraphicsEngineD3DBase/CMakeLists.txt index 2a4daae2..a60f000f 100644 --- a/Graphics/GraphicsEngineD3DBase/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3DBase/CMakeLists.txt @@ -3,18 +3,18 @@ cmake_minimum_required (VERSION 3.10) project(Diligent-GraphicsEngineD3DBase CXX) set(INCLUDE - include/D3DErrors.h - include/D3DShaderResourceLoader.h - include/D3DTypeConversionImpl.h - include/D3DViewDescConversionImpl.h + include/D3DErrors.hpp + include/D3DShaderResourceLoader.hpp + include/D3DTypeConversionImpl.hpp + include/D3DViewDescConversionImpl.hpp include/DXGITypeConversions.h - include/EngineFactoryD3DBase.h + include/EngineFactoryD3DBase.hpp include/HLSLDefinitions.fxh - include/RenderDeviceD3DBase.h - include/ShaderD3DBase.h - include/ShaderResources.h - include/ShaderVariableD3DBase.h - include/SwapChainD3DBase.h + include/RenderDeviceD3DBase.hpp + include/ShaderD3DBase.hpp + include/ShaderResources.hpp + include/ShaderVariableD3DBase.hpp + include/SwapChainD3DBase.hpp ) set(INTERFACE diff --git a/Graphics/GraphicsEngineD3DBase/include/D3DErrors.h b/Graphics/GraphicsEngineD3DBase/include/D3DErrors.hpp index 51863b7a..51863b7a 100644 --- a/Graphics/GraphicsEngineD3DBase/include/D3DErrors.h +++ b/Graphics/GraphicsEngineD3DBase/include/D3DErrors.hpp diff --git a/Graphics/GraphicsEngineD3DBase/include/D3DShaderResourceLoader.h b/Graphics/GraphicsEngineD3DBase/include/D3DShaderResourceLoader.hpp index 64e08580..64e08580 100644 --- a/Graphics/GraphicsEngineD3DBase/include/D3DShaderResourceLoader.h +++ b/Graphics/GraphicsEngineD3DBase/include/D3DShaderResourceLoader.hpp diff --git a/Graphics/GraphicsEngineD3DBase/include/D3DTypeConversionImpl.h b/Graphics/GraphicsEngineD3DBase/include/D3DTypeConversionImpl.hpp index 0e2c684d..0e2c684d 100644 --- a/Graphics/GraphicsEngineD3DBase/include/D3DTypeConversionImpl.h +++ b/Graphics/GraphicsEngineD3DBase/include/D3DTypeConversionImpl.hpp diff --git a/Graphics/GraphicsEngineD3DBase/include/D3DViewDescConversionImpl.h b/Graphics/GraphicsEngineD3DBase/include/D3DViewDescConversionImpl.hpp index 5f6939a8..5f6939a8 100644 --- a/Graphics/GraphicsEngineD3DBase/include/D3DViewDescConversionImpl.h +++ b/Graphics/GraphicsEngineD3DBase/include/D3DViewDescConversionImpl.hpp diff --git a/Graphics/GraphicsEngineD3DBase/include/EngineFactoryD3DBase.h b/Graphics/GraphicsEngineD3DBase/include/EngineFactoryD3DBase.hpp index e2f04091..1e610f62 100644 --- a/Graphics/GraphicsEngineD3DBase/include/EngineFactoryD3DBase.h +++ b/Graphics/GraphicsEngineD3DBase/include/EngineFactoryD3DBase.hpp @@ -28,7 +28,7 @@ #pragma once #include "DXGITypeConversions.h" -#include "EngineFactoryBase.h" +#include "EngineFactoryBase.hpp" /// \file /// Implementation of the Diligent::EngineFactoryD3DBase template class diff --git a/Graphics/GraphicsEngineD3DBase/include/RenderDeviceD3DBase.h b/Graphics/GraphicsEngineD3DBase/include/RenderDeviceD3DBase.hpp index a1f0f601..5b11dabc 100644 --- a/Graphics/GraphicsEngineD3DBase/include/RenderDeviceD3DBase.h +++ b/Graphics/GraphicsEngineD3DBase/include/RenderDeviceD3DBase.hpp @@ -30,7 +30,7 @@ /// \file /// Implementation of the Diligent::RenderDeviceBase template class and related structures -#include "RenderDeviceBase.h" +#include "RenderDeviceBase.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3DBase/include/ShaderD3DBase.h b/Graphics/GraphicsEngineD3DBase/include/ShaderD3DBase.hpp index e7b61f59..e7b61f59 100644 --- a/Graphics/GraphicsEngineD3DBase/include/ShaderD3DBase.h +++ b/Graphics/GraphicsEngineD3DBase/include/ShaderD3DBase.hpp diff --git a/Graphics/GraphicsEngineD3DBase/include/ShaderResources.h b/Graphics/GraphicsEngineD3DBase/include/ShaderResources.hpp index 343c4177..a2ed64dd 100644 --- a/Graphics/GraphicsEngineD3DBase/include/ShaderResources.h +++ b/Graphics/GraphicsEngineD3DBase/include/ShaderResources.hpp @@ -65,7 +65,7 @@ #include "STDAllocator.h" #include "HashUtils.h" #include "StringPool.h" -#include "D3DShaderResourceLoader.h" +#include "D3DShaderResourceLoader.hpp" #include "PipelineState.h" namespace Diligent diff --git a/Graphics/GraphicsEngineD3DBase/include/ShaderVariableD3DBase.h b/Graphics/GraphicsEngineD3DBase/include/ShaderVariableD3DBase.hpp index 3c566b20..c89610f9 100644 --- a/Graphics/GraphicsEngineD3DBase/include/ShaderVariableD3DBase.h +++ b/Graphics/GraphicsEngineD3DBase/include/ShaderVariableD3DBase.hpp @@ -27,7 +27,7 @@ #pragma once -#include "ShaderResourceVariableBase.h" +#include "ShaderResourceVariableBase.hpp" #include "ShaderResourceVariableD3D.h" /// \file diff --git a/Graphics/GraphicsEngineD3DBase/include/SwapChainD3DBase.h b/Graphics/GraphicsEngineD3DBase/include/SwapChainD3DBase.hpp index a3b091d2..70856a63 100644 --- a/Graphics/GraphicsEngineD3DBase/include/SwapChainD3DBase.h +++ b/Graphics/GraphicsEngineD3DBase/include/SwapChainD3DBase.hpp @@ -28,7 +28,7 @@ #pragma once #include <VersionHelpers.h> -#include "SwapChainBase.h" +#include "SwapChainBase.hpp" /// \file /// Base implementation of a D3D swap chain diff --git a/Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp b/Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp index 07cd4536..20fe247e 100644 --- a/Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp +++ b/Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp @@ -28,11 +28,11 @@ #include <unordered_map> #include <D3Dcompiler.h> -#include "D3DErrors.h" +#include "D3DErrors.hpp" #include "DataBlobImpl.h" #include "RefCntAutoPtr.h" #include <atlcomcli.h> -#include "ShaderD3DBase.h" +#include "ShaderD3DBase.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp b/Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp index 34742425..b56fa540 100644 --- a/Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp +++ b/Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp @@ -28,9 +28,9 @@ #include "pch.h" #include "EngineMemory.h" #include "StringTools.h" -#include "ShaderResources.h" +#include "ShaderResources.hpp" #include "HashUtils.h" -#include "ShaderResourceVariableBase.h" +#include "ShaderResourceVariableBase.hpp" #include "Align.h" namespace Diligent diff --git a/Graphics/GraphicsEngineNextGenBase/include/DeviceContextNextGenBase.h b/Graphics/GraphicsEngineNextGenBase/include/DeviceContextNextGenBase.h index f5b04389..8954e3d4 100644 --- a/Graphics/GraphicsEngineNextGenBase/include/DeviceContextNextGenBase.h +++ b/Graphics/GraphicsEngineNextGenBase/include/DeviceContextNextGenBase.h @@ -31,7 +31,7 @@ #include "BasicTypes.h" #include "ReferenceCounters.h" #include "RefCntAutoPtr.h" -#include "DeviceContextBase.h" +#include "DeviceContextBase.hpp" #include "RefCntAutoPtr.h" namespace Diligent diff --git a/Graphics/GraphicsEngineOpenGL/include/BufferGLImpl.h b/Graphics/GraphicsEngineOpenGL/include/BufferGLImpl.h index 591a619a..d20387a0 100644 --- a/Graphics/GraphicsEngineOpenGL/include/BufferGLImpl.h +++ b/Graphics/GraphicsEngineOpenGL/include/BufferGLImpl.h @@ -28,7 +28,7 @@ #pragma once #include "BufferGL.h" -#include "BufferBase.h" +#include "BufferBase.hpp" #include "GLObjectWrapper.h" #include "AsyncWritableResource.h" #include "BaseInterfacesGL.h" diff --git a/Graphics/GraphicsEngineOpenGL/include/BufferViewGLImpl.h b/Graphics/GraphicsEngineOpenGL/include/BufferViewGLImpl.h index 5cfabefd..af999d75 100644 --- a/Graphics/GraphicsEngineOpenGL/include/BufferViewGLImpl.h +++ b/Graphics/GraphicsEngineOpenGL/include/BufferViewGLImpl.h @@ -29,7 +29,7 @@ #include "BufferViewGL.h" #include "BaseInterfacesGL.h" -#include "BufferViewBase.h" +#include "BufferViewBase.hpp" #include "RenderDevice.h" #include "GLObjectWrapper.h" #include "RenderDeviceGLImpl.h" diff --git a/Graphics/GraphicsEngineOpenGL/include/DeviceContextGLImpl.h b/Graphics/GraphicsEngineOpenGL/include/DeviceContextGLImpl.h index b18fd7c1..1c314e48 100644 --- a/Graphics/GraphicsEngineOpenGL/include/DeviceContextGLImpl.h +++ b/Graphics/GraphicsEngineOpenGL/include/DeviceContextGLImpl.h @@ -28,7 +28,7 @@ #pragma once #include "DeviceContextGL.h" -#include "DeviceContextBase.h" +#include "DeviceContextBase.hpp" #include "BaseInterfacesGL.h" #include "GLContextState.h" #include "GLObjectWrapper.h" diff --git a/Graphics/GraphicsEngineOpenGL/include/FenceGLImpl.h b/Graphics/GraphicsEngineOpenGL/include/FenceGLImpl.h index 88669737..f7fc4338 100644 --- a/Graphics/GraphicsEngineOpenGL/include/FenceGLImpl.h +++ b/Graphics/GraphicsEngineOpenGL/include/FenceGLImpl.h @@ -33,7 +33,7 @@ #include <deque> #include "FenceGL.h" #include "RenderDeviceGL.h" -#include "FenceBase.h" +#include "FenceBase.hpp" #include "GLObjectWrapper.h" #include "RenderDeviceGLImpl.h" diff --git a/Graphics/GraphicsEngineOpenGL/include/GLPipelineResourceLayout.h b/Graphics/GraphicsEngineOpenGL/include/GLPipelineResourceLayout.h index 7b95aadc..967f9411 100644 --- a/Graphics/GraphicsEngineOpenGL/include/GLPipelineResourceLayout.h +++ b/Graphics/GraphicsEngineOpenGL/include/GLPipelineResourceLayout.h @@ -70,7 +70,7 @@ #include <array> #include "Object.h" -#include "ShaderResourceVariableBase.h" +#include "ShaderResourceVariableBase.hpp" #include "GLProgramResources.h" #include "GLProgramResourceCache.h" diff --git a/Graphics/GraphicsEngineOpenGL/include/GLProgramResources.h b/Graphics/GraphicsEngineOpenGL/include/GLProgramResources.h index 8aa14a79..40c64c8e 100644 --- a/Graphics/GraphicsEngineOpenGL/include/GLProgramResources.h +++ b/Graphics/GraphicsEngineOpenGL/include/GLProgramResources.h @@ -44,7 +44,7 @@ #include "Object.h" #include "StringPool.h" #include "HashUtils.h" -#include "ShaderResourceVariableBase.h" +#include "ShaderResourceVariableBase.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.h b/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.h index 28070e6b..1893f2c7 100644 --- a/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.h +++ b/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.h @@ -29,7 +29,7 @@ #include <vector> #include "PipelineStateGL.h" -#include "PipelineStateBase.h" +#include "PipelineStateBase.hpp" #include "RenderDevice.h" #include "GLObjectWrapper.h" #include "GLContext.h" diff --git a/Graphics/GraphicsEngineOpenGL/include/QueryGLImpl.h b/Graphics/GraphicsEngineOpenGL/include/QueryGLImpl.h index f10c7bf2..4725db86 100644 --- a/Graphics/GraphicsEngineOpenGL/include/QueryGLImpl.h +++ b/Graphics/GraphicsEngineOpenGL/include/QueryGLImpl.h @@ -32,7 +32,7 @@ #include "QueryGL.h" #include "RenderDeviceGL.h" -#include "QueryBase.h" +#include "QueryBase.hpp" #include "GLObjectWrapper.h" #include "RenderDeviceGLImpl.h" diff --git a/Graphics/GraphicsEngineOpenGL/include/RenderDeviceGLImpl.h b/Graphics/GraphicsEngineOpenGL/include/RenderDeviceGLImpl.h index a048eee2..b5dcfa80 100644 --- a/Graphics/GraphicsEngineOpenGL/include/RenderDeviceGLImpl.h +++ b/Graphics/GraphicsEngineOpenGL/include/RenderDeviceGLImpl.h @@ -28,7 +28,7 @@ #pragma once #include <memory> -#include "RenderDeviceBase.h" +#include "RenderDeviceBase.hpp" #include "GLContext.h" #include "VAOCache.h" #include "BaseInterfacesGL.h" diff --git a/Graphics/GraphicsEngineOpenGL/include/SamplerGLImpl.h b/Graphics/GraphicsEngineOpenGL/include/SamplerGLImpl.h index 39ec621e..23c94545 100644 --- a/Graphics/GraphicsEngineOpenGL/include/SamplerGLImpl.h +++ b/Graphics/GraphicsEngineOpenGL/include/SamplerGLImpl.h @@ -29,7 +29,7 @@ #include "BaseInterfacesGL.h" #include "SamplerGL.h" -#include "SamplerBase.h" +#include "SamplerBase.hpp" #include "RenderDevice.h" #include "GLObjectWrapper.h" #include "RenderDeviceGLImpl.h" diff --git a/Graphics/GraphicsEngineOpenGL/include/ShaderGLImpl.h b/Graphics/GraphicsEngineOpenGL/include/ShaderGLImpl.h index a2528381..5a855e18 100644 --- a/Graphics/GraphicsEngineOpenGL/include/ShaderGLImpl.h +++ b/Graphics/GraphicsEngineOpenGL/include/ShaderGLImpl.h @@ -29,7 +29,7 @@ #include "BaseInterfacesGL.h" #include "ShaderGL.h" -#include "ShaderBase.h" +#include "ShaderBase.hpp" #include "RenderDevice.h" #include "GLObjectWrapper.h" #include "RenderDeviceGLImpl.h" diff --git a/Graphics/GraphicsEngineOpenGL/include/ShaderResourceBindingGLImpl.h b/Graphics/GraphicsEngineOpenGL/include/ShaderResourceBindingGLImpl.h index 9a845340..46b4ebd1 100644 --- a/Graphics/GraphicsEngineOpenGL/include/ShaderResourceBindingGLImpl.h +++ b/Graphics/GraphicsEngineOpenGL/include/ShaderResourceBindingGLImpl.h @@ -32,9 +32,9 @@ #include "ShaderResourceBindingGL.h" #include "RenderDeviceGL.h" -#include "ShaderResourceBindingBase.h" +#include "ShaderResourceBindingBase.hpp" #include "GLProgramResources.h" -#include "ShaderBase.h" +#include "ShaderBase.hpp" #include "GLProgramResourceCache.h" #include "GLPipelineResourceLayout.h" diff --git a/Graphics/GraphicsEngineOpenGL/include/SwapChainGLBase.h b/Graphics/GraphicsEngineOpenGL/include/SwapChainGLBase.h index 8ab5cd8a..19d5afb0 100644 --- a/Graphics/GraphicsEngineOpenGL/include/SwapChainGLBase.h +++ b/Graphics/GraphicsEngineOpenGL/include/SwapChainGLBase.h @@ -27,7 +27,7 @@ #pragma once -#include "SwapChainBase.h" +#include "SwapChainBase.hpp" #include "TextureViewGLImpl.h" namespace Diligent diff --git a/Graphics/GraphicsEngineOpenGL/include/TextureBaseGL.h b/Graphics/GraphicsEngineOpenGL/include/TextureBaseGL.h index e0e29714..5865f435 100644 --- a/Graphics/GraphicsEngineOpenGL/include/TextureBaseGL.h +++ b/Graphics/GraphicsEngineOpenGL/include/TextureBaseGL.h @@ -29,7 +29,7 @@ #include "BaseInterfacesGL.h" #include "TextureGL.h" -#include "TextureBase.h" +#include "TextureBase.hpp" #include "RenderDevice.h" #include "GLObjectWrapper.h" #include "TextureViewGLImpl.h" diff --git a/Graphics/GraphicsEngineOpenGL/include/TextureViewGLImpl.h b/Graphics/GraphicsEngineOpenGL/include/TextureViewGLImpl.h index ea3a4d8f..2a3b831c 100644 --- a/Graphics/GraphicsEngineOpenGL/include/TextureViewGLImpl.h +++ b/Graphics/GraphicsEngineOpenGL/include/TextureViewGLImpl.h @@ -29,7 +29,7 @@ #include "BaseInterfacesGL.h" #include "TextureViewGL.h" -#include "TextureViewBase.h" +#include "TextureViewBase.hpp" #include "RenderDevice.h" #include "GLObjectWrapper.h" #include "RenderDeviceGLImpl.h" diff --git a/Graphics/GraphicsEngineOpenGL/include/VAOCache.h b/Graphics/GraphicsEngineOpenGL/include/VAOCache.h index b1434b1f..b7dbd93f 100644 --- a/Graphics/GraphicsEngineOpenGL/include/VAOCache.h +++ b/Graphics/GraphicsEngineOpenGL/include/VAOCache.h @@ -33,7 +33,7 @@ #include "InputLayout.h" #include "LockHelper.h" #include "HashUtils.h" -#include "DeviceContextBase.h" +#include "DeviceContextBase.hpp" #include "BaseInterfacesGL.h" namespace Diligent diff --git a/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp b/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp index 04a19d7e..d8bb9d51 100644 --- a/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp @@ -34,7 +34,7 @@ #include "DeviceContextGLImpl.h" #include "EngineMemory.h" #include "HLSL2GLSLConverterObject.h" -#include "EngineFactoryBase.h" +#include "EngineFactoryBase.hpp" #if PLATFORM_IOS # include "SwapChainGLIOS.h" diff --git a/Graphics/GraphicsEngineOpenGL/src/GLPipelineResourceLayout.cpp b/Graphics/GraphicsEngineOpenGL/src/GLPipelineResourceLayout.cpp index 865e8d42..fb4feea1 100644 --- a/Graphics/GraphicsEngineOpenGL/src/GLPipelineResourceLayout.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/GLPipelineResourceLayout.cpp @@ -30,7 +30,7 @@ #include "GLPipelineResourceLayout.h" #include "Align.h" #include "PlatformMisc.h" -#include "ShaderBase.h" +#include "ShaderBase.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineOpenGL/src/GLProgramResources.cpp b/Graphics/GraphicsEngineOpenGL/src/GLProgramResources.cpp index 7c1da197..0c618c2f 100644 --- a/Graphics/GraphicsEngineOpenGL/src/GLProgramResources.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/GLProgramResources.cpp @@ -30,8 +30,8 @@ #include "GLContextState.h" #include "GLProgramResources.h" #include "RenderDeviceGLImpl.h" -#include "ShaderResourceBindingBase.h" -#include "ShaderResourceVariableBase.h" +#include "ShaderResourceBindingBase.hpp" +#include "ShaderResourceVariableBase.hpp" #include "Align.h" namespace Diligent diff --git a/Graphics/GraphicsEngineVulkan/include/BufferViewVkImpl.h b/Graphics/GraphicsEngineVulkan/include/BufferViewVkImpl.h index 0ce3f911..d2dc9285 100644 --- a/Graphics/GraphicsEngineVulkan/include/BufferViewVkImpl.h +++ b/Graphics/GraphicsEngineVulkan/include/BufferViewVkImpl.h @@ -32,7 +32,7 @@ #include "BufferViewVk.h" #include "RenderDeviceVk.h" -#include "BufferViewBase.h" +#include "BufferViewBase.hpp" #include "VulkanUtilities/VulkanObjectWrappers.h" #include "RenderDeviceVkImpl.h" diff --git a/Graphics/GraphicsEngineVulkan/include/BufferVkImpl.h b/Graphics/GraphicsEngineVulkan/include/BufferVkImpl.h index 24a664f7..fade6a46 100644 --- a/Graphics/GraphicsEngineVulkan/include/BufferVkImpl.h +++ b/Graphics/GraphicsEngineVulkan/include/BufferVkImpl.h @@ -32,7 +32,7 @@ #include "BufferVk.h" #include "RenderDeviceVk.h" -#include "BufferBase.h" +#include "BufferBase.hpp" #include "BufferViewVkImpl.h" #include "VulkanDynamicHeap.h" #include "VulkanUtilities/VulkanObjectWrappers.h" diff --git a/Graphics/GraphicsEngineVulkan/include/CommandListVkImpl.h b/Graphics/GraphicsEngineVulkan/include/CommandListVkImpl.h index 3cf32d25..4084e51c 100644 --- a/Graphics/GraphicsEngineVulkan/include/CommandListVkImpl.h +++ b/Graphics/GraphicsEngineVulkan/include/CommandListVkImpl.h @@ -31,7 +31,7 @@ /// Declaration of Diligent::CommandListVkImpl class #include "vulkan.h" -#include "CommandListBase.h" +#include "CommandListBase.hpp" #include "RenderDeviceVkImpl.h" namespace Diligent diff --git a/Graphics/GraphicsEngineVulkan/include/FenceVkImpl.h b/Graphics/GraphicsEngineVulkan/include/FenceVkImpl.h index 4743ba11..27aa8510 100644 --- a/Graphics/GraphicsEngineVulkan/include/FenceVkImpl.h +++ b/Graphics/GraphicsEngineVulkan/include/FenceVkImpl.h @@ -32,7 +32,7 @@ #include <deque> #include "FenceVk.h" -#include "FenceBase.h" +#include "FenceBase.hpp" #include "VulkanUtilities/VulkanFencePool.h" #include "RenderDeviceVkImpl.h" diff --git a/Graphics/GraphicsEngineVulkan/include/ManagedVulkanObject.h b/Graphics/GraphicsEngineVulkan/include/ManagedVulkanObject.h index 90ef0151..d2c11471 100644 --- a/Graphics/GraphicsEngineVulkan/include/ManagedVulkanObject.h +++ b/Graphics/GraphicsEngineVulkan/include/ManagedVulkanObject.h @@ -27,7 +27,7 @@ #pragma once -#include "DeviceObjectBase.h" +#include "DeviceObjectBase.hpp" #include "RenderDeviceVkImpl.h" #include "VulkanUtilities/VulkanLogicalDevice.h" diff --git a/Graphics/GraphicsEngineVulkan/include/PipelineLayout.h b/Graphics/GraphicsEngineVulkan/include/PipelineLayout.h index 861013d7..acd60630 100644 --- a/Graphics/GraphicsEngineVulkan/include/PipelineLayout.h +++ b/Graphics/GraphicsEngineVulkan/include/PipelineLayout.h @@ -31,7 +31,7 @@ /// Declaration of Diligent::PipelineLayout class #include <array> -#include "ShaderBase.h" +#include "ShaderBase.hpp" #include "ShaderResourceLayoutVk.h" #include "VulkanUtilities/VulkanObjectWrappers.h" #include "VulkanUtilities/VulkanLogicalDevice.h" diff --git a/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.h b/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.h index 62306819..d41e7ce5 100644 --- a/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.h +++ b/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.h @@ -34,7 +34,7 @@ #include "RenderDeviceVk.h" #include "PipelineStateVk.h" -#include "PipelineStateBase.h" +#include "PipelineStateBase.hpp" #include "PipelineLayout.h" #include "ShaderResourceLayoutVk.h" #include "ShaderVariableVk.h" diff --git a/Graphics/GraphicsEngineVulkan/include/QueryVkImpl.h b/Graphics/GraphicsEngineVulkan/include/QueryVkImpl.h index 9782a6c8..c326ce4f 100644 --- a/Graphics/GraphicsEngineVulkan/include/QueryVkImpl.h +++ b/Graphics/GraphicsEngineVulkan/include/QueryVkImpl.h @@ -31,7 +31,7 @@ /// Declaration of Diligent::QueryVkImpl class #include "QueryVk.h" -#include "QueryBase.h" +#include "QueryBase.hpp" #include "RenderDeviceVkImpl.h" #include "QueryManagerVk.h" diff --git a/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.h b/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.h index bbdab268..66683412 100644 --- a/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.h +++ b/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.h @@ -32,7 +32,7 @@ #include <memory> #include "RenderDeviceVk.h" -#include "RenderDeviceBase.h" +#include "RenderDeviceBase.hpp" #include "RenderDeviceNextGenBase.h" #include "DescriptorPoolManager.h" #include "VulkanDynamicHeap.h" diff --git a/Graphics/GraphicsEngineVulkan/include/SamplerVkImpl.h b/Graphics/GraphicsEngineVulkan/include/SamplerVkImpl.h index 0a7b585a..ed412ed7 100644 --- a/Graphics/GraphicsEngineVulkan/include/SamplerVkImpl.h +++ b/Graphics/GraphicsEngineVulkan/include/SamplerVkImpl.h @@ -32,7 +32,7 @@ #include "SamplerVk.h" #include "RenderDeviceVk.h" -#include "SamplerBase.h" +#include "SamplerBase.hpp" #include "VulkanUtilities/VulkanObjectWrappers.h" #include "RenderDeviceVkImpl.h" diff --git a/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.h b/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.h index 786ed279..b79177e5 100644 --- a/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.h +++ b/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.h @@ -32,8 +32,8 @@ #include "ShaderResourceBindingVk.h" #include "RenderDeviceVk.h" -#include "ShaderResourceBindingBase.h" -#include "ShaderBase.h" +#include "ShaderResourceBindingBase.hpp" +#include "ShaderBase.hpp" #include "ShaderResourceCacheVk.h" #include "ShaderVariableVk.h" diff --git a/Graphics/GraphicsEngineVulkan/include/ShaderResourceLayoutVk.h b/Graphics/GraphicsEngineVulkan/include/ShaderResourceLayoutVk.h index a9737056..2cd12452 100644 --- a/Graphics/GraphicsEngineVulkan/include/ShaderResourceLayoutVk.h +++ b/Graphics/GraphicsEngineVulkan/include/ShaderResourceLayoutVk.h @@ -101,7 +101,7 @@ #include <memory> #include "PipelineState.h" -#include "ShaderBase.h" +#include "ShaderBase.hpp" #include "HashUtils.h" #include "ShaderResourceCacheVk.h" #include "SPIRVShaderResources.hpp" diff --git a/Graphics/GraphicsEngineVulkan/include/ShaderVariableVk.h b/Graphics/GraphicsEngineVulkan/include/ShaderVariableVk.h index 43e47834..b494f4b5 100644 --- a/Graphics/GraphicsEngineVulkan/include/ShaderVariableVk.h +++ b/Graphics/GraphicsEngineVulkan/include/ShaderVariableVk.h @@ -62,7 +62,7 @@ #include <memory> #include "ShaderResourceLayoutVk.h" -#include "ShaderResourceVariableBase.h" +#include "ShaderResourceVariableBase.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineVulkan/include/ShaderVkImpl.h b/Graphics/GraphicsEngineVulkan/include/ShaderVkImpl.h index b8297102..d1bee3ba 100644 --- a/Graphics/GraphicsEngineVulkan/include/ShaderVkImpl.h +++ b/Graphics/GraphicsEngineVulkan/include/ShaderVkImpl.h @@ -32,7 +32,7 @@ #include "RenderDeviceVk.h" #include "ShaderVk.h" -#include "ShaderBase.h" +#include "ShaderBase.hpp" #include "SPIRVShaderResources.hpp" #include "RenderDeviceVkImpl.h" diff --git a/Graphics/GraphicsEngineVulkan/include/SwapChainVkImpl.h b/Graphics/GraphicsEngineVulkan/include/SwapChainVkImpl.h index b4221c5c..807d7489 100644 --- a/Graphics/GraphicsEngineVulkan/include/SwapChainVkImpl.h +++ b/Graphics/GraphicsEngineVulkan/include/SwapChainVkImpl.h @@ -31,7 +31,7 @@ /// Declaration of Diligent::SwapChainVkImpl class #include "SwapChainVk.h" -#include "SwapChainBase.h" +#include "SwapChainBase.hpp" #include "VulkanUtilities/VulkanInstance.h" #include "VulkanUtilities/VulkanObjectWrappers.h" #include "ManagedVulkanObject.h" diff --git a/Graphics/GraphicsEngineVulkan/include/TextureViewVkImpl.h b/Graphics/GraphicsEngineVulkan/include/TextureViewVkImpl.h index 853ddcec..abde01ef 100644 --- a/Graphics/GraphicsEngineVulkan/include/TextureViewVkImpl.h +++ b/Graphics/GraphicsEngineVulkan/include/TextureViewVkImpl.h @@ -32,7 +32,7 @@ #include "TextureViewVk.h" #include "RenderDeviceVk.h" -#include "TextureViewBase.h" +#include "TextureViewBase.hpp" #include "VulkanUtilities/VulkanObjectWrappers.h" #include "RenderDeviceVkImpl.h" diff --git a/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.h b/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.h index 6404be56..2140a43d 100644 --- a/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.h +++ b/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.h @@ -32,7 +32,7 @@ #include "TextureVk.h" #include "RenderDeviceVk.h" -#include "TextureBase.h" +#include "TextureBase.hpp" #include "TextureViewVkImpl.h" #include "VulkanUtilities/VulkanMemoryManager.h" #include "RenderDeviceVkImpl.h" diff --git a/Graphics/GraphicsEngineVulkan/include/pch.h b/Graphics/GraphicsEngineVulkan/include/pch.h index 5b82c7a9..2c193f3e 100644 --- a/Graphics/GraphicsEngineVulkan/include/pch.h +++ b/Graphics/GraphicsEngineVulkan/include/pch.h @@ -74,5 +74,5 @@ template <> struct hash<VkFormat> #include "Errors.h" #include "RefCntAutoPtr.h" #include "VulkanErrors.h" -#include "RenderDeviceBase.h" +#include "RenderDeviceBase.hpp" #include "ValidatedCast.h" diff --git a/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp b/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp index 264eb168..8614c925 100644 --- a/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp +++ b/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp @@ -38,7 +38,7 @@ #include "CommandQueueVkImpl.h" #include "VulkanUtilities/VulkanInstance.h" #include "VulkanUtilities/VulkanPhysicalDevice.h" -#include "EngineFactoryBase.h" +#include "EngineFactoryBase.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp b/Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp index 325deb5b..fb383f37 100644 --- a/Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp +++ b/Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp @@ -36,7 +36,7 @@ #include "SamplerVkImpl.h" #include "ShaderVkImpl.h" #include "PipelineLayout.h" -#include "ShaderResourceVariableBase.h" +#include "ShaderResourceVariableBase.hpp" #include "StringTools.h" #include "PipelineStateVkImpl.h" diff --git a/Graphics/GraphicsEngineVulkan/src/ShaderVariableVk.cpp b/Graphics/GraphicsEngineVulkan/src/ShaderVariableVk.cpp index 171e138a..8c8a4460 100644 --- a/Graphics/GraphicsEngineVulkan/src/ShaderVariableVk.cpp +++ b/Graphics/GraphicsEngineVulkan/src/ShaderVariableVk.cpp @@ -28,7 +28,7 @@ #include "pch.h" #include "ShaderVariableVk.h" -#include "ShaderResourceVariableBase.h" +#include "ShaderResourceVariableBase.hpp" namespace Diligent { diff --git a/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp b/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp index 9e73aafe..d142aac5 100644 --- a/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp +++ b/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp @@ -358,7 +358,7 @@ #include <string> #include "HLSL2GLSLConverterImpl.h" -#include "ShaderBase.h" +#include "ShaderBase.hpp" #include "DataBlobImpl.h" #include "StringDataBlobImpl.h" #include "StringTools.h" |