From fb014bd8176eb739ba3273120d0653f1fda0a533 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Sat, 29 Dec 2018 18:45:15 -0800 Subject: Added Metal backend stub --- Graphics/GraphicsEngine/include/DeviceContextBase.h | 2 ++ Graphics/GraphicsEngine/include/PipelineStateBase.h | 2 ++ Graphics/GraphicsEngine/include/ShaderBase.h | 2 ++ Graphics/GraphicsEngine/include/TextureBase.h | 4 +++- Graphics/GraphicsEngine/interface/DeviceCaps.h | 11 ++++++----- 5 files changed, 15 insertions(+), 6 deletions(-) (limited to 'Graphics/GraphicsEngine') 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 + #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 +#include + #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 + #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 -- cgit v1.2.3