From 9c9fe3d40eba06990af0eba3e5c47eb8c5e55d03 Mon Sep 17 00:00:00 2001 From: assiduous Date: Thu, 23 Jul 2020 17:10:08 -0700 Subject: Fixed Metal build error --- Graphics/GraphicsEngineMetal/CMakeLists.txt | 1 + .../include/RenderPassMtlImpl.h | 54 ++++++++++++++++++++++ .../include/RenderPassMtlImpl.hpp | 54 ---------------------- 3 files changed, 55 insertions(+), 54 deletions(-) create mode 100644 Graphics/GraphicsEngineMetal/include/RenderPassMtlImpl.h delete mode 100644 Graphics/GraphicsEngineMetal/include/RenderPassMtlImpl.hpp (limited to 'Graphics/GraphicsEngineMetal') diff --git a/Graphics/GraphicsEngineMetal/CMakeLists.txt b/Graphics/GraphicsEngineMetal/CMakeLists.txt index 27b16620..ac047e78 100644 --- a/Graphics/GraphicsEngineMetal/CMakeLists.txt +++ b/Graphics/GraphicsEngineMetal/CMakeLists.txt @@ -13,6 +13,7 @@ set(INCLUDE include/PipelineStateMtlImpl.h include/QueryMtlImpl.h include/RenderDeviceMtlImpl.h + include/RenderPassMtlImpl.h include/SamplerMtlImpl.h include/ShaderMtlImpl.h include/ShaderResourceBindingMtlImpl.h diff --git a/Graphics/GraphicsEngineMetal/include/RenderPassMtlImpl.h b/Graphics/GraphicsEngineMetal/include/RenderPassMtlImpl.h new file mode 100644 index 00000000..2c900713 --- /dev/null +++ b/Graphics/GraphicsEngineMetal/include/RenderPassMtlImpl.h @@ -0,0 +1,54 @@ +/* + * Copyright 2019-2020 Diligent Graphics LLC + * Copyright 2015-2019 Egor Yusov + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#pragma once + +/// \file +/// Declaration of Diligent::RenderPassMtlImpl class + +#include "RenderDeviceMtl.h" +#include "RenderPassBase.hpp" +#include "RenderDeviceMtlImpl.hpp" + +namespace Diligent +{ + +class FixedBlockMemoryAllocator; + +/// Render pass implementation in Direct3D11 backend. +class RenderPassMtlImpl final : public RenderPassBase +{ +public: + using TRenderPassBase = RenderPassBase; + + RenderPassMtlImpl(IReferenceCounters* pRefCounters, + RenderDeviceMtlImpl* pDevice, + const RenderPassDesc& Desc); + ~RenderPassMtlImpl(); +}; + +} // namespace Diligent diff --git a/Graphics/GraphicsEngineMetal/include/RenderPassMtlImpl.hpp b/Graphics/GraphicsEngineMetal/include/RenderPassMtlImpl.hpp deleted file mode 100644 index 2c900713..00000000 --- a/Graphics/GraphicsEngineMetal/include/RenderPassMtlImpl.hpp +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2019-2020 Diligent Graphics LLC - * Copyright 2015-2019 Egor Yusov - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * In no event and under no legal theory, whether in tort (including negligence), - * contract, or otherwise, unless required by applicable law (such as deliberate - * and grossly negligent acts) or agreed to in writing, shall any Contributor be - * liable for any damages, including any direct, indirect, special, incidental, - * or consequential damages of any character arising as a result of this License or - * out of the use or inability to use the software (including but not limited to damages - * for loss of goodwill, work stoppage, computer failure or malfunction, or any and - * all other commercial damages or losses), even if such Contributor has been advised - * of the possibility of such damages. - */ - -#pragma once - -/// \file -/// Declaration of Diligent::RenderPassMtlImpl class - -#include "RenderDeviceMtl.h" -#include "RenderPassBase.hpp" -#include "RenderDeviceMtlImpl.hpp" - -namespace Diligent -{ - -class FixedBlockMemoryAllocator; - -/// Render pass implementation in Direct3D11 backend. -class RenderPassMtlImpl final : public RenderPassBase -{ -public: - using TRenderPassBase = RenderPassBase; - - RenderPassMtlImpl(IReferenceCounters* pRefCounters, - RenderDeviceMtlImpl* pDevice, - const RenderPassDesc& Desc); - ~RenderPassMtlImpl(); -}; - -} // namespace Diligent -- cgit v1.2.3