summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngine
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2020-11-06 04:39:08 +0000
committerassiduous <assiduous@diligentgraphics.com>2020-11-06 04:39:08 +0000
commit65b375263ac6e91ae04c48faae921d261b55aff5 (patch)
tree12320209b0af35e675c479c048fd12901e9a9f8f /Graphics/GraphicsEngine
parentRefactored BottomLevelASBase (diff)
downloadDiligentCore-65b375263ac6e91ae04c48faae921d261b55aff5.tar.gz
DiligentCore-65b375263ac6e91ae04c48faae921d261b55aff5.zip
GraphicsEngineBase: removed pch.h
Diffstat (limited to 'Graphics/GraphicsEngine')
-rw-r--r--Graphics/GraphicsEngine/CMakeLists.txt1
-rw-r--r--Graphics/GraphicsEngine/include/PipelineStateBase.hpp1
-rw-r--r--Graphics/GraphicsEngine/include/ResourceMappingImpl.hpp4
-rw-r--r--Graphics/GraphicsEngine/src/BottomLevelASBase.cpp1
-rw-r--r--Graphics/GraphicsEngine/src/BufferBase.cpp1
-rw-r--r--Graphics/GraphicsEngine/src/DefaultShaderSourceStreamFactory.cpp1
-rw-r--r--Graphics/GraphicsEngine/src/EngineMemory.cpp2
-rw-r--r--Graphics/GraphicsEngine/src/FramebufferBase.cpp1
-rw-r--r--Graphics/GraphicsEngine/src/PipelineStateBase.cpp1
-rw-r--r--Graphics/GraphicsEngine/src/RenderPassBase.cpp1
-rw-r--r--Graphics/GraphicsEngine/src/ResourceMappingBase.cpp7
-rw-r--r--Graphics/GraphicsEngine/src/TextureBase.cpp2
12 files changed, 8 insertions, 15 deletions
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 <array>
#include <vector>
+#include <unordered_map>
#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 <unordered_map>
+
#include "ResourceMapping.h"
#include "ObjectBase.hpp"
-#include <unordered_map>
#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<IDeviceObject>(pObject)));
+ std::make_pair(Diligent::ResMappingHashKey(Name, true, StartIndex + Elem), // Make a copy of the source string
+ Diligent::RefCntAutoPtr<IDeviceObject>(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