diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-01-28 06:35:03 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-01-28 06:35:03 +0000 |
| commit | eacdb92963564b88ee56a455ddf3475cccf90584 (patch) | |
| tree | 9cbedd7c3be17f55016b57aeb178abed3808be27 /Graphics/GraphicsEngineMetal | |
| parent | Implemented C Interface for OpenGL backend (diff) | |
| download | DiligentCore-eacdb92963564b88ee56a455ddf3475cccf90584.tar.gz DiligentCore-eacdb92963564b88ee56a455ddf3475cccf90584.zip | |
Fixed MacOS build issues
Diffstat (limited to 'Graphics/GraphicsEngineMetal')
6 files changed, 5 insertions, 6 deletions
diff --git a/Graphics/GraphicsEngineMetal/include/BufferViewMtlImpl.h b/Graphics/GraphicsEngineMetal/include/BufferViewMtlImpl.h index 3a8a3039..e68fcc3f 100644 --- a/Graphics/GraphicsEngineMetal/include/BufferViewMtlImpl.h +++ b/Graphics/GraphicsEngineMetal/include/BufferViewMtlImpl.h @@ -44,7 +44,7 @@ public: BufferViewMtlImpl(IReferenceCounters* pRefCounters, RenderDeviceMtlImpl* pDevice, const BufferViewDesc& ViewDesc, - class IBuffer* pBuffer, + IBuffer* pBuffer, void* pMtlView, bool bIsDefaultView); diff --git a/Graphics/GraphicsEngineMetal/include/ShaderMtlImpl.h b/Graphics/GraphicsEngineMetal/include/ShaderMtlImpl.h index 5f2da6bb..3623d6cc 100644 --- a/Graphics/GraphicsEngineMetal/include/ShaderMtlImpl.h +++ b/Graphics/GraphicsEngineMetal/include/ShaderMtlImpl.h @@ -57,7 +57,7 @@ public: virtual void GetResourceDesc(Uint32 Index, ShaderResourceDesc& ResourceDesc) const override final { LOG_ERROR_MESSAGE("ShaderMtlImpl::GetResource() is not implemented"); - return ShaderResourceDesc{}; + ResourceDesc = ShaderResourceDesc{}; } private: diff --git a/Graphics/GraphicsEngineMetal/include/SwapChainMtlImpl.h b/Graphics/GraphicsEngineMetal/include/SwapChainMtlImpl.h index 4207deb7..0654f2a7 100644 --- a/Graphics/GraphicsEngineMetal/include/SwapChainMtlImpl.h +++ b/Graphics/GraphicsEngineMetal/include/SwapChainMtlImpl.h @@ -32,7 +32,6 @@ namespace Diligent { -class IMemoryAllocator; /// Implementation of the Diligent::ISwapChainMtl interface class SwapChainMtlImpl final : public SwapChainBase<ISwapChainMtl> { diff --git a/Graphics/GraphicsEngineMetal/include/TextureViewMtlImpl.h b/Graphics/GraphicsEngineMetal/include/TextureViewMtlImpl.h index e104428c..bdb04af6 100644 --- a/Graphics/GraphicsEngineMetal/include/TextureViewMtlImpl.h +++ b/Graphics/GraphicsEngineMetal/include/TextureViewMtlImpl.h @@ -45,7 +45,7 @@ public: TextureViewMtlImpl(IReferenceCounters* pRefCounters, RenderDeviceMtlImpl* pDevice, const TextureViewDesc& ViewDesc, - class ITexture* pTexture, + ITexture* pTexture, void* pMtlView, bool bIsDefaultView); diff --git a/Graphics/GraphicsEngineMetal/src/BufferMtlImpl.mm b/Graphics/GraphicsEngineMetal/src/BufferMtlImpl.mm index 924c258c..0ef8c817 100644 --- a/Graphics/GraphicsEngineMetal/src/BufferMtlImpl.mm +++ b/Graphics/GraphicsEngineMetal/src/BufferMtlImpl.mm @@ -26,7 +26,7 @@ #include "DeviceContextMtlImpl.h" #include "MtlTypeConversions.h" #include "BufferViewMtlImpl.h" -#include "GraphicsAccessories.h" +#include "GraphicsAccessories.hpp" #include "EngineMemory.h" namespace Diligent diff --git a/Graphics/GraphicsEngineMetal/src/EngineFactoryMtl.mm b/Graphics/GraphicsEngineMetal/src/EngineFactoryMtl.mm index 2f8d1eb1..a845f121 100644 --- a/Graphics/GraphicsEngineMetal/src/EngineFactoryMtl.mm +++ b/Graphics/GraphicsEngineMetal/src/EngineFactoryMtl.mm @@ -30,7 +30,7 @@ #include "SwapChainMtlImpl.h" #include "MtlTypeConversions.h" #include "EngineMemory.h" -#include "EngineFactoryBase.h" +#include "EngineFactoryBase.hpp" namespace Diligent { |