diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-05-20 17:51:17 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-05-20 17:51:17 +0000 |
| commit | 4c759756cdb24109bee27fda5922e2e9e98403ae (patch) | |
| tree | ce41852bec0a42526e9a14eff700216435f56df9 | |
| parent | Improved latency handling in D3D11 and D3D12 (API 240061, fixed https://githu... (diff) | |
| download | DiligentCore-4c759756cdb24109bee27fda5922e2e9e98403ae.tar.gz DiligentCore-4c759756cdb24109bee27fda5922e2e9e98403ae.zip | |
Removed backend macros verification from PlatformDefinitions.h
| -rw-r--r-- | Graphics/GraphicsEngine/include/Defines.h | 4 | ||||
| -rw-r--r-- | Platforms/interface/PlatformDefinitions.h | 5 | ||||
| -rw-r--r-- | Tests/IncludeTest/Common/FilteringToolsH_test.cpp | 28 |
3 files changed, 32 insertions, 5 deletions
diff --git a/Graphics/GraphicsEngine/include/Defines.h b/Graphics/GraphicsEngine/include/Defines.h index d283cf70..be44e098 100644 --- a/Graphics/GraphicsEngine/include/Defines.h +++ b/Graphics/GraphicsEngine/include/Defines.h @@ -26,3 +26,7 @@ */ #pragma once + +#if !D3D11_SUPPORTED && !D3D12_SUPPORTED && !GL_SUPPORTED && !GLES_SUPPORTED && !VULKAN_SUPPORTED && !METAL_SUPPORTED +# error No API is supported on this platform. At least one of D3D11_SUPPORTED, D3D12_SUPPORTED, GL_SUPPORTED, GLES_SUPPORTED, VULKAN_SUPPORTED, or METAL_SUPPORTED macros must be defined as 1. +#endif diff --git a/Platforms/interface/PlatformDefinitions.h b/Platforms/interface/PlatformDefinitions.h index 2ab2a38c..96516bdf 100644 --- a/Platforms/interface/PlatformDefinitions.h +++ b/Platforms/interface/PlatformDefinitions.h @@ -37,11 +37,6 @@ # error Unknown platform. Please define one of the following macros as 1: PLATFORM_WIN32, PLATFORM_UNIVERSAL_WINDOWS, PLATFORM_ANDROID, PLATFORM_LINUX, PLATFORM_MACOS, PLATFORM_IOS. #endif - -#if !D3D11_SUPPORTED && !D3D12_SUPPORTED && !GL_SUPPORTED && !GLES_SUPPORTED && !VULKAN_SUPPORTED && !METAL_SUPPORTED -# error No API is supported on this platform. At least one of D3D11_SUPPORTED, D3D12_SUPPORTED, GL_SUPPORTED, GLES_SUPPORTED, VULKAN_SUPPORTED, or METAL_SUPPORTED macros must be defined as 1. -#endif - #if PLATFORM_WIN32 # if PLATFORM_UNIVERSAL_WINDOWS || PLATFORM_ANDROID || PLATFORM_LINUX || PLATFORM_MACOS || PLATFORM_IOS diff --git a/Tests/IncludeTest/Common/FilteringToolsH_test.cpp b/Tests/IncludeTest/Common/FilteringToolsH_test.cpp new file mode 100644 index 00000000..1d5f1b3f --- /dev/null +++ b/Tests/IncludeTest/Common/FilteringToolsH_test.cpp @@ -0,0 +1,28 @@ +/* + * 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. + */ + +#include "DiligentCore/Common/interface/FilteringTools.hpp" |
