diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2021-02-08 19:56:56 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2021-03-19 00:31:34 +0000 |
| commit | 9220e5a6b5e8449786acb996204b140305df94fc (patch) | |
| tree | b1977c0108e1f6804ff5e9ba7ebe173a8c09f5e1 /Graphics/GraphicsTools | |
| parent | Reworked PipelineResourceSignatureTest.VulkanDescriptorIndexing to validate r... (diff) | |
| parent | Updated readme (diff) | |
| download | DiligentCore-9220e5a6b5e8449786acb996204b140305df94fc.tar.gz DiligentCore-9220e5a6b5e8449786acb996204b140305df94fc.zip | |
Merged master
Diffstat (limited to 'Graphics/GraphicsTools')
| -rw-r--r-- | Graphics/GraphicsTools/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsTools/interface/pch.h | 28 | ||||
| -rw-r--r-- | Graphics/GraphicsTools/src/DurationQueryHelper.cpp | 1 | ||||
| -rw-r--r-- | Graphics/GraphicsTools/src/GraphicsUtilities.cpp | 1 | ||||
| -rw-r--r-- | Graphics/GraphicsTools/src/ScopedQueryHelper.cpp | 1 | ||||
| -rw-r--r-- | Graphics/GraphicsTools/src/ScreenCapture.cpp | 1 | ||||
| -rw-r--r-- | Graphics/GraphicsTools/src/TextureUploader.cpp | 1 | ||||
| -rw-r--r-- | Graphics/GraphicsTools/src/TextureUploaderD3D11.cpp | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsTools/src/TextureUploaderGL.cpp | 1 | ||||
| -rw-r--r-- | Graphics/GraphicsTools/src/pch.cpp | 28 |
10 files changed, 0 insertions, 66 deletions
diff --git a/Graphics/GraphicsTools/CMakeLists.txt b/Graphics/GraphicsTools/CMakeLists.txt index aeb4131f..09728c33 100644 --- a/Graphics/GraphicsTools/CMakeLists.txt +++ b/Graphics/GraphicsTools/CMakeLists.txt @@ -10,7 +10,6 @@ set(INTERFACE interface/DurationQueryHelper.hpp interface/GraphicsUtilities.h interface/MapHelper.hpp - interface/pch.h interface/ScopedQueryHelper.hpp interface/ScreenCapture.hpp interface/ShaderMacroHelper.hpp @@ -27,7 +26,6 @@ set(SOURCE src/GraphicsUtilities.cpp src/ScopedQueryHelper.cpp src/ScreenCapture.cpp - src/pch.cpp src/TextureUploader.cpp ) diff --git a/Graphics/GraphicsTools/interface/pch.h b/Graphics/GraphicsTools/interface/pch.h deleted file mode 100644 index d3fa402f..00000000 --- a/Graphics/GraphicsTools/interface/pch.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2019-2021 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 diff --git a/Graphics/GraphicsTools/src/DurationQueryHelper.cpp b/Graphics/GraphicsTools/src/DurationQueryHelper.cpp index ed6d0b64..1af4bb18 100644 --- a/Graphics/GraphicsTools/src/DurationQueryHelper.cpp +++ b/Graphics/GraphicsTools/src/DurationQueryHelper.cpp @@ -25,7 +25,6 @@ * of the possibility of such damages. */ -#include "pch.h" #include "DurationQueryHelper.hpp" namespace Diligent diff --git a/Graphics/GraphicsTools/src/GraphicsUtilities.cpp b/Graphics/GraphicsTools/src/GraphicsUtilities.cpp index c6f798d2..2226d790 100644 --- a/Graphics/GraphicsTools/src/GraphicsUtilities.cpp +++ b/Graphics/GraphicsTools/src/GraphicsUtilities.cpp @@ -25,7 +25,6 @@ * of the possibility of such damages. */ -#include "pch.h" #include <algorithm> #include <cmath> diff --git a/Graphics/GraphicsTools/src/ScopedQueryHelper.cpp b/Graphics/GraphicsTools/src/ScopedQueryHelper.cpp index 9b7e6a6e..f03f4d32 100644 --- a/Graphics/GraphicsTools/src/ScopedQueryHelper.cpp +++ b/Graphics/GraphicsTools/src/ScopedQueryHelper.cpp @@ -25,7 +25,6 @@ * of the possibility of such damages. */ -#include "pch.h" #include "ScopedQueryHelper.hpp" namespace Diligent diff --git a/Graphics/GraphicsTools/src/ScreenCapture.cpp b/Graphics/GraphicsTools/src/ScreenCapture.cpp index e1b18c88..5d37560e 100644 --- a/Graphics/GraphicsTools/src/ScreenCapture.cpp +++ b/Graphics/GraphicsTools/src/ScreenCapture.cpp @@ -25,7 +25,6 @@ * of the possibility of such damages. */ -#include "pch.h" #include "ScreenCapture.hpp" namespace Diligent diff --git a/Graphics/GraphicsTools/src/TextureUploader.cpp b/Graphics/GraphicsTools/src/TextureUploader.cpp index 622945ca..0d27f62a 100644 --- a/Graphics/GraphicsTools/src/TextureUploader.cpp +++ b/Graphics/GraphicsTools/src/TextureUploader.cpp @@ -25,7 +25,6 @@ * of the possibility of such damages. */ -#include "pch.h" #if D3D11_SUPPORTED # include "TextureUploaderD3D11.hpp" #endif diff --git a/Graphics/GraphicsTools/src/TextureUploaderD3D11.cpp b/Graphics/GraphicsTools/src/TextureUploaderD3D11.cpp index 76eec864..91c47512 100644 --- a/Graphics/GraphicsTools/src/TextureUploaderD3D11.cpp +++ b/Graphics/GraphicsTools/src/TextureUploaderD3D11.cpp @@ -25,8 +25,6 @@ * of the possibility of such damages. */ -#include "pch.h" - #include <unordered_map> #include <deque> #include <mutex> diff --git a/Graphics/GraphicsTools/src/TextureUploaderGL.cpp b/Graphics/GraphicsTools/src/TextureUploaderGL.cpp index 34c4789f..0fabd561 100644 --- a/Graphics/GraphicsTools/src/TextureUploaderGL.cpp +++ b/Graphics/GraphicsTools/src/TextureUploaderGL.cpp @@ -25,7 +25,6 @@ * of the possibility of such damages. */ -#include "pch.h" #include <mutex> #include <deque> #include <unordered_map> diff --git a/Graphics/GraphicsTools/src/pch.cpp b/Graphics/GraphicsTools/src/pch.cpp deleted file mode 100644 index 8f74c6f2..00000000 --- a/Graphics/GraphicsTools/src/pch.cpp +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2019-2021 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 "pch.h" |
