summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngine
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2018-12-30 02:45:15 +0000
committerEgor Yusov <egor.yusov@gmail.com>2018-12-30 02:45:15 +0000
commitfb014bd8176eb739ba3273120d0653f1fda0a533 (patch)
tree75eea02e86998e6189a99293282ae019a8202e30 /Graphics/GraphicsEngine
parentMinor fix in cmake file (diff)
downloadDiligentCore-fb014bd8176eb739ba3273120d0653f1fda0a533.tar.gz
DiligentCore-fb014bd8176eb739ba3273120d0653f1fda0a533.zip
Added Metal backend stub
Diffstat (limited to 'Graphics/GraphicsEngine')
-rw-r--r--Graphics/GraphicsEngine/include/DeviceContextBase.h2
-rw-r--r--Graphics/GraphicsEngine/include/PipelineStateBase.h2
-rw-r--r--Graphics/GraphicsEngine/include/ShaderBase.h2
-rw-r--r--Graphics/GraphicsEngine/include/TextureBase.h4
-rw-r--r--Graphics/GraphicsEngine/interface/DeviceCaps.h11
5 files changed, 15 insertions, 6 deletions
diff --git a/Graphics/GraphicsEngine/include/DeviceContextBase.h b/Graphics/GraphicsEngine/include/DeviceContextBase.h
index cd37a9e3..dfe63174 100644
--- a/Graphics/GraphicsEngine/include/DeviceContextBase.h
+++ b/Graphics/GraphicsEngine/include/DeviceContextBase.h
@@ -26,6 +26,8 @@
/// \file
/// Implementation of the Diligent::DeviceContextBase template class and related structures
+#include <unordered_map>
+
#include "DeviceContext.h"
#include "DeviceObjectBase.h"
#include "Defines.h"
diff --git a/Graphics/GraphicsEngine/include/PipelineStateBase.h b/Graphics/GraphicsEngine/include/PipelineStateBase.h
index 05bb2997..8123b49e 100644
--- a/Graphics/GraphicsEngine/include/PipelineStateBase.h
+++ b/Graphics/GraphicsEngine/include/PipelineStateBase.h
@@ -27,6 +27,8 @@
/// Implementation of the Diligent::PipelineStateBase template class
#include <array>
+#include <vector>
+
#include "PipelineState.h"
#include "DeviceObjectBase.h"
#include "STDAllocator.h"
diff --git a/Graphics/GraphicsEngine/include/ShaderBase.h b/Graphics/GraphicsEngine/include/ShaderBase.h
index de772250..20715338 100644
--- a/Graphics/GraphicsEngine/include/ShaderBase.h
+++ b/Graphics/GraphicsEngine/include/ShaderBase.h
@@ -26,6 +26,8 @@
/// \file
/// Implementation of the Diligent::ShaderBase template class
+#include <vector>
+
#include "Shader.h"
#include "DeviceObjectBase.h"
#include "STDAllocator.h"
diff --git a/Graphics/GraphicsEngine/include/TextureBase.h b/Graphics/GraphicsEngine/include/TextureBase.h
index 990b9bc2..9e9968fe 100644
--- a/Graphics/GraphicsEngine/include/TextureBase.h
+++ b/Graphics/GraphicsEngine/include/TextureBase.h
@@ -36,8 +36,10 @@
namespace Diligent
{
+struct CopyTextureAttribs;
+
void ValidateTextureDesc(const TextureDesc& TexDesc);
-void ValidateUpdateTextureParams( const TextureDesc &TexDesc, Uint32 MipLevel, Uint32 Slice, const Box& DstBox, const TextureSubResData& SubresData );
+void ValidateUpdateTextureParams( const TextureDesc& TexDesc, Uint32 MipLevel, Uint32 Slice, const Box& DstBox, const TextureSubResData& SubresData );
void ValidateCopyTextureParams( const CopyTextureAttribs& CopyAttribs );
void ValidateMapTextureParams(const TextureDesc& TexDesc,
Uint32 MipLevel,
diff --git a/Graphics/GraphicsEngine/interface/DeviceCaps.h b/Graphics/GraphicsEngine/interface/DeviceCaps.h
index aacedfcf..d79350a0 100644
--- a/Graphics/GraphicsEngine/interface/DeviceCaps.h
+++ b/Graphics/GraphicsEngine/interface/DeviceCaps.h
@@ -34,11 +34,12 @@ namespace Diligent
enum class DeviceType : Int32
{
Undefined = 0, ///< Undefined device
- D3D11, ///< D3D11 device
- D3D12, ///< D3D12 device
- OpenGL, ///< OpenGL device
- OpenGLES, ///< OpenGLES device
- Vulkan ///< Vulkan device
+ D3D11, ///< D3D11 device
+ D3D12, ///< D3D12 device
+ OpenGL, ///< OpenGL device
+ OpenGLES, ///< OpenGLES device
+ Vulkan, ///< Vulkan device
+ Metal ///< Metal device (not yet implemented)
};
/// Texture sampler capabilities