From 6d28115323d7a6262f6c06c4df8601d56847bbc4 Mon Sep 17 00:00:00 2001 From: assiduous Date: Sun, 26 Jan 2020 19:24:55 -0800 Subject: Fixed build issues in Metal backend --- Graphics/GraphicsEngineMetal/include/BufferMtlImpl.h | 2 +- Graphics/GraphicsEngineMetal/include/BufferViewMtlImpl.h | 2 +- Graphics/GraphicsEngineMetal/include/CommandListMtlImpl.h | 2 +- Graphics/GraphicsEngineMetal/include/DeviceContextMtlImpl.h | 2 +- Graphics/GraphicsEngineMetal/include/FenceMtlImpl.h | 2 +- Graphics/GraphicsEngineMetal/include/PipelineStateMtlImpl.h | 4 ++-- Graphics/GraphicsEngineMetal/include/QueryMtlImpl.h | 2 +- Graphics/GraphicsEngineMetal/include/RenderDeviceMtlImpl.h | 2 +- Graphics/GraphicsEngineMetal/include/SamplerMtlImpl.h | 2 +- Graphics/GraphicsEngineMetal/include/ShaderMtlImpl.h | 3 +-- Graphics/GraphicsEngineMetal/include/ShaderResourceBindingMtlImpl.h | 4 ++-- Graphics/GraphicsEngineMetal/include/SwapChainMtlImpl.h | 2 +- Graphics/GraphicsEngineMetal/include/TextureMtlImpl.h | 2 +- Graphics/GraphicsEngineMetal/include/TextureViewMtlImpl.h | 2 +- 14 files changed, 16 insertions(+), 17 deletions(-) (limited to 'Graphics/GraphicsEngineMetal') diff --git a/Graphics/GraphicsEngineMetal/include/BufferMtlImpl.h b/Graphics/GraphicsEngineMetal/include/BufferMtlImpl.h index 6608a5eb..c3d49edf 100644 --- a/Graphics/GraphicsEngineMetal/include/BufferMtlImpl.h +++ b/Graphics/GraphicsEngineMetal/include/BufferMtlImpl.h @@ -28,7 +28,7 @@ #include "BufferMtl.h" #include "RenderDeviceMtl.h" -#include "BufferBase.h" +#include "BufferBase.hpp" #include "BufferViewMtlImpl.h" #include "RenderDeviceMtlImpl.h" diff --git a/Graphics/GraphicsEngineMetal/include/BufferViewMtlImpl.h b/Graphics/GraphicsEngineMetal/include/BufferViewMtlImpl.h index 6c7ee77b..3a8a3039 100644 --- a/Graphics/GraphicsEngineMetal/include/BufferViewMtlImpl.h +++ b/Graphics/GraphicsEngineMetal/include/BufferViewMtlImpl.h @@ -28,7 +28,7 @@ #include "BufferViewMtl.h" #include "RenderDeviceMtl.h" -#include "BufferViewBase.h" +#include "BufferViewBase.hpp" #include "RenderDeviceMtlImpl.h" namespace Diligent diff --git a/Graphics/GraphicsEngineMetal/include/CommandListMtlImpl.h b/Graphics/GraphicsEngineMetal/include/CommandListMtlImpl.h index 259545b6..ec740917 100644 --- a/Graphics/GraphicsEngineMetal/include/CommandListMtlImpl.h +++ b/Graphics/GraphicsEngineMetal/include/CommandListMtlImpl.h @@ -27,7 +27,7 @@ /// Declaration of Diligent::CommandListMtlImpl class #include "RenderDeviceMtl.h" -#include "CommandListBase.h" +#include "CommandListBase.hpp" #include "RenderDeviceMtlImpl.h" namespace Diligent diff --git a/Graphics/GraphicsEngineMetal/include/DeviceContextMtlImpl.h b/Graphics/GraphicsEngineMetal/include/DeviceContextMtlImpl.h index 55495847..be12a4cd 100644 --- a/Graphics/GraphicsEngineMetal/include/DeviceContextMtlImpl.h +++ b/Graphics/GraphicsEngineMetal/include/DeviceContextMtlImpl.h @@ -27,7 +27,7 @@ /// Declaration of Diligent::DeviceContextMtlImpl class #include "DeviceContextMtl.h" -#include "DeviceContextBase.h" +#include "DeviceContextBase.hpp" #include "ShaderMtlImpl.h" #include "BufferMtlImpl.h" #include "TextureMtlImpl.h" diff --git a/Graphics/GraphicsEngineMetal/include/FenceMtlImpl.h b/Graphics/GraphicsEngineMetal/include/FenceMtlImpl.h index 5cbead49..f6ee76aa 100644 --- a/Graphics/GraphicsEngineMetal/include/FenceMtlImpl.h +++ b/Graphics/GraphicsEngineMetal/include/FenceMtlImpl.h @@ -29,7 +29,7 @@ #include #include "FenceMtl.h" #include "RenderDeviceMtl.h" -#include "FenceBase.h" +#include "FenceBase.hpp" #include "RenderDeviceMtlImpl.h" namespace Diligent diff --git a/Graphics/GraphicsEngineMetal/include/PipelineStateMtlImpl.h b/Graphics/GraphicsEngineMetal/include/PipelineStateMtlImpl.h index ad6f5c7a..470ce823 100644 --- a/Graphics/GraphicsEngineMetal/include/PipelineStateMtlImpl.h +++ b/Graphics/GraphicsEngineMetal/include/PipelineStateMtlImpl.h @@ -28,9 +28,9 @@ #include "PipelineStateMtl.h" #include "RenderDeviceMtl.h" -#include "PipelineStateBase.h" +#include "PipelineStateBase.hpp" #include "ShaderMtlImpl.h" -#include "SRBMemoryAllocator.h" +#include "SRBMemoryAllocator.hpp" #include "RenderDeviceMtlImpl.h" namespace Diligent diff --git a/Graphics/GraphicsEngineMetal/include/QueryMtlImpl.h b/Graphics/GraphicsEngineMetal/include/QueryMtlImpl.h index af8025eb..b2d03c5a 100644 --- a/Graphics/GraphicsEngineMetal/include/QueryMtlImpl.h +++ b/Graphics/GraphicsEngineMetal/include/QueryMtlImpl.h @@ -29,7 +29,7 @@ #include #include "QueryMtl.h" #include "RenderDeviceMtl.h" -#include "QueryBase.h" +#include "QueryBase.hpp" #include "RenderDeviceMtlImpl.h" namespace Diligent diff --git a/Graphics/GraphicsEngineMetal/include/RenderDeviceMtlImpl.h b/Graphics/GraphicsEngineMetal/include/RenderDeviceMtlImpl.h index 1d2dd2cd..e1f2070c 100644 --- a/Graphics/GraphicsEngineMetal/include/RenderDeviceMtlImpl.h +++ b/Graphics/GraphicsEngineMetal/include/RenderDeviceMtlImpl.h @@ -27,7 +27,7 @@ /// Declaration of Diligent::RenderDeviceMtlImpl class #include "RenderDeviceMtl.h" -#include "RenderDeviceBase.h" +#include "RenderDeviceBase.hpp" #include "DeviceContextMtl.h" namespace Diligent diff --git a/Graphics/GraphicsEngineMetal/include/SamplerMtlImpl.h b/Graphics/GraphicsEngineMetal/include/SamplerMtlImpl.h index 48ac4c97..8a714112 100644 --- a/Graphics/GraphicsEngineMetal/include/SamplerMtlImpl.h +++ b/Graphics/GraphicsEngineMetal/include/SamplerMtlImpl.h @@ -28,7 +28,7 @@ #include "SamplerMtl.h" #include "RenderDeviceMtl.h" -#include "SamplerBase.h" +#include "SamplerBase.hpp" #include "RenderDeviceMtlImpl.h" namespace Diligent diff --git a/Graphics/GraphicsEngineMetal/include/ShaderMtlImpl.h b/Graphics/GraphicsEngineMetal/include/ShaderMtlImpl.h index 245799e3..5f2da6bb 100644 --- a/Graphics/GraphicsEngineMetal/include/ShaderMtlImpl.h +++ b/Graphics/GraphicsEngineMetal/include/ShaderMtlImpl.h @@ -28,8 +28,7 @@ #include "ShaderMtl.h" #include "RenderDeviceMtl.h" -#include "ShaderBase.h" -#include "ShaderBase.h" +#include "ShaderBase.hpp" #include "RenderDeviceMtlImpl.h" namespace Diligent diff --git a/Graphics/GraphicsEngineMetal/include/ShaderResourceBindingMtlImpl.h b/Graphics/GraphicsEngineMetal/include/ShaderResourceBindingMtlImpl.h index 67bf6adf..2b33c4b4 100644 --- a/Graphics/GraphicsEngineMetal/include/ShaderResourceBindingMtlImpl.h +++ b/Graphics/GraphicsEngineMetal/include/ShaderResourceBindingMtlImpl.h @@ -28,8 +28,8 @@ #include "ShaderResourceBindingMtl.h" #include "RenderDeviceMtl.h" -#include "ShaderResourceBindingBase.h" -#include "STDAllocator.h" +#include "ShaderResourceBindingBase.hpp" +#include "STDAllocator.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineMetal/include/SwapChainMtlImpl.h b/Graphics/GraphicsEngineMetal/include/SwapChainMtlImpl.h index b850e6c5..4207deb7 100644 --- a/Graphics/GraphicsEngineMetal/include/SwapChainMtlImpl.h +++ b/Graphics/GraphicsEngineMetal/include/SwapChainMtlImpl.h @@ -27,7 +27,7 @@ /// Declaration of Diligent::SwapChainMtlImpl class #include "SwapChainMtl.h" -#include "SwapChainBase.h" +#include "SwapChainBase.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineMetal/include/TextureMtlImpl.h b/Graphics/GraphicsEngineMetal/include/TextureMtlImpl.h index bfd428b2..292be2af 100644 --- a/Graphics/GraphicsEngineMetal/include/TextureMtlImpl.h +++ b/Graphics/GraphicsEngineMetal/include/TextureMtlImpl.h @@ -28,7 +28,7 @@ #include "TextureMtl.h" #include "RenderDeviceMtl.h" -#include "TextureBase.h" +#include "TextureBase.hpp" #include "TextureViewMtlImpl.h" #include "RenderDeviceMtlImpl.h" diff --git a/Graphics/GraphicsEngineMetal/include/TextureViewMtlImpl.h b/Graphics/GraphicsEngineMetal/include/TextureViewMtlImpl.h index 7f4e60a7..e104428c 100644 --- a/Graphics/GraphicsEngineMetal/include/TextureViewMtlImpl.h +++ b/Graphics/GraphicsEngineMetal/include/TextureViewMtlImpl.h @@ -28,7 +28,7 @@ #include "TextureViewMtl.h" #include "RenderDeviceMtl.h" -#include "TextureViewBase.h" +#include "TextureViewBase.hpp" #include "RenderDeviceMtlImpl.h" namespace Diligent -- cgit v1.2.3