From 65b375263ac6e91ae04c48faae921d261b55aff5 Mon Sep 17 00:00:00 2001 From: assiduous Date: Thu, 5 Nov 2020 20:39:08 -0800 Subject: GraphicsEngineBase: removed pch.h --- Graphics/GraphicsEngine/CMakeLists.txt | 1 - Graphics/GraphicsEngine/include/PipelineStateBase.hpp | 1 + Graphics/GraphicsEngine/include/ResourceMappingImpl.hpp | 4 +++- Graphics/GraphicsEngine/src/BottomLevelASBase.cpp | 1 - Graphics/GraphicsEngine/src/BufferBase.cpp | 1 - Graphics/GraphicsEngine/src/DefaultShaderSourceStreamFactory.cpp | 1 - Graphics/GraphicsEngine/src/EngineMemory.cpp | 2 +- Graphics/GraphicsEngine/src/FramebufferBase.cpp | 1 - Graphics/GraphicsEngine/src/PipelineStateBase.cpp | 1 - Graphics/GraphicsEngine/src/RenderPassBase.cpp | 1 - Graphics/GraphicsEngine/src/ResourceMappingBase.cpp | 7 ++----- Graphics/GraphicsEngine/src/TextureBase.cpp | 2 +- 12 files changed, 8 insertions(+), 15 deletions(-) (limited to 'Graphics/GraphicsEngine') diff --git a/Graphics/GraphicsEngine/CMakeLists.txt b/Graphics/GraphicsEngine/CMakeLists.txt index db339e11..a5597f77 100644 --- a/Graphics/GraphicsEngine/CMakeLists.txt +++ b/Graphics/GraphicsEngine/CMakeLists.txt @@ -14,7 +14,6 @@ set(INCLUDE include/EngineMemory.h include/FenceBase.hpp include/FramebufferBase.hpp - include/pch.h include/PipelineStateBase.hpp include/QueryBase.hpp include/RenderDeviceBase.hpp diff --git a/Graphics/GraphicsEngine/include/PipelineStateBase.hpp b/Graphics/GraphicsEngine/include/PipelineStateBase.hpp index caa96110..5245c589 100644 --- a/Graphics/GraphicsEngine/include/PipelineStateBase.hpp +++ b/Graphics/GraphicsEngine/include/PipelineStateBase.hpp @@ -32,6 +32,7 @@ #include #include +#include #include "PipelineState.h" #include "DeviceObjectBase.hpp" diff --git a/Graphics/GraphicsEngine/include/ResourceMappingImpl.hpp b/Graphics/GraphicsEngine/include/ResourceMappingImpl.hpp index 144ecdd5..b64c8804 100644 --- a/Graphics/GraphicsEngine/include/ResourceMappingImpl.hpp +++ b/Graphics/GraphicsEngine/include/ResourceMappingImpl.hpp @@ -30,11 +30,13 @@ /// \file /// Declaration of the Diligent::ResourceMappingImpl class +#include + #include "ResourceMapping.h" #include "ObjectBase.hpp" -#include #include "HashUtils.hpp" #include "STDAllocator.hpp" +#include "RefCntAutoPtr.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngine/src/BottomLevelASBase.cpp b/Graphics/GraphicsEngine/src/BottomLevelASBase.cpp index fec51592..092161b7 100644 --- a/Graphics/GraphicsEngine/src/BottomLevelASBase.cpp +++ b/Graphics/GraphicsEngine/src/BottomLevelASBase.cpp @@ -25,7 +25,6 @@ * of the possibility of such damages. */ -#include "pch.h" #include "BottomLevelASBase.hpp" namespace Diligent diff --git a/Graphics/GraphicsEngine/src/BufferBase.cpp b/Graphics/GraphicsEngine/src/BufferBase.cpp index 5b72389a..88ed62d9 100644 --- a/Graphics/GraphicsEngine/src/BufferBase.cpp +++ b/Graphics/GraphicsEngine/src/BufferBase.cpp @@ -25,7 +25,6 @@ * of the possibility of such damages. */ -#include "pch.h" #include "Buffer.h" #include "GraphicsAccessories.hpp" diff --git a/Graphics/GraphicsEngine/src/DefaultShaderSourceStreamFactory.cpp b/Graphics/GraphicsEngine/src/DefaultShaderSourceStreamFactory.cpp index b14a1707..d9ab87ea 100644 --- a/Graphics/GraphicsEngine/src/DefaultShaderSourceStreamFactory.cpp +++ b/Graphics/GraphicsEngine/src/DefaultShaderSourceStreamFactory.cpp @@ -25,7 +25,6 @@ * of the possibility of such damages. */ -#include "pch.h" #include "DefaultShaderSourceStreamFactory.h" #include "ObjectBase.hpp" #include "RefCntAutoPtr.hpp" diff --git a/Graphics/GraphicsEngine/src/EngineMemory.cpp b/Graphics/GraphicsEngine/src/EngineMemory.cpp index 198bf0ba..7e8ab0cc 100644 --- a/Graphics/GraphicsEngine/src/EngineMemory.cpp +++ b/Graphics/GraphicsEngine/src/EngineMemory.cpp @@ -29,9 +29,9 @@ // RenderEngine.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information -#include "pch.h" #include "EngineMemory.h" #include "DefaultRawMemoryAllocator.hpp" +#include "Errors.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngine/src/FramebufferBase.cpp b/Graphics/GraphicsEngine/src/FramebufferBase.cpp index 41943b09..0434bf0a 100644 --- a/Graphics/GraphicsEngine/src/FramebufferBase.cpp +++ b/Graphics/GraphicsEngine/src/FramebufferBase.cpp @@ -25,7 +25,6 @@ * of the possibility of such damages. */ -#include "pch.h" #include "FramebufferBase.hpp" #include "GraphicsAccessories.hpp" diff --git a/Graphics/GraphicsEngine/src/PipelineStateBase.cpp b/Graphics/GraphicsEngine/src/PipelineStateBase.cpp index 6491d15e..09c33293 100644 --- a/Graphics/GraphicsEngine/src/PipelineStateBase.cpp +++ b/Graphics/GraphicsEngine/src/PipelineStateBase.cpp @@ -25,7 +25,6 @@ * of the possibility of such damages. */ -#include "pch.h" #include "PipelineStateBase.hpp" namespace Diligent diff --git a/Graphics/GraphicsEngine/src/RenderPassBase.cpp b/Graphics/GraphicsEngine/src/RenderPassBase.cpp index b6b38dd0..7c594d99 100644 --- a/Graphics/GraphicsEngine/src/RenderPassBase.cpp +++ b/Graphics/GraphicsEngine/src/RenderPassBase.cpp @@ -25,7 +25,6 @@ * of the possibility of such damages. */ -#include "pch.h" #include "RenderPassBase.hpp" #include "GraphicsAccessories.hpp" #include "Align.hpp" diff --git a/Graphics/GraphicsEngine/src/ResourceMappingBase.cpp b/Graphics/GraphicsEngine/src/ResourceMappingBase.cpp index bf34056c..5ab951b4 100644 --- a/Graphics/GraphicsEngine/src/ResourceMappingBase.cpp +++ b/Graphics/GraphicsEngine/src/ResourceMappingBase.cpp @@ -25,12 +25,9 @@ * of the possibility of such damages. */ -#include "pch.h" #include "ResourceMappingImpl.hpp" #include "DeviceObjectBase.hpp" -using namespace std; - namespace Diligent { ResourceMappingImpl::~ResourceMappingImpl() @@ -57,8 +54,8 @@ void ResourceMappingImpl::AddResourceArray(const Char* Name, Uint32 StartIndex, // Try to construct new element in place auto Elems = m_HashTable.emplace( - make_pair(Diligent::ResMappingHashKey(Name, true, StartIndex + Elem), // Make a copy of the source string - Diligent::RefCntAutoPtr(pObject))); + std::make_pair(Diligent::ResMappingHashKey(Name, true, StartIndex + Elem), // Make a copy of the source string + Diligent::RefCntAutoPtr(pObject))); // If there is already element with the same name, replace it if (!Elems.second && Elems.first->second != pObject) { diff --git a/Graphics/GraphicsEngine/src/TextureBase.cpp b/Graphics/GraphicsEngine/src/TextureBase.cpp index 93050ff1..cd31242f 100644 --- a/Graphics/GraphicsEngine/src/TextureBase.cpp +++ b/Graphics/GraphicsEngine/src/TextureBase.cpp @@ -25,8 +25,8 @@ * of the possibility of such damages. */ -#include "pch.h" #include "Texture.h" +#include "DeviceContext.h" #include "GraphicsAccessories.hpp" namespace Diligent -- cgit v1.2.3