From 3c67ae0da1a0efaef2526f345d45c6726bf5040a Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Sat, 15 Sep 2018 14:47:57 -0700 Subject: Fixed windows/linux build warnings --- Graphics/GraphicsEngineD3D11/CMakeLists.txt | 2 -- .../include/D3D11DebugUtilities.h | 33 ---------------------- .../src/D3D11DebugUtilities.cpp | 31 -------------------- .../src/DeviceContextD3D11Impl.cpp | 1 - 4 files changed, 67 deletions(-) delete mode 100644 Graphics/GraphicsEngineD3D11/include/D3D11DebugUtilities.h delete mode 100644 Graphics/GraphicsEngineD3D11/src/D3D11DebugUtilities.cpp (limited to 'Graphics/GraphicsEngineD3D11') diff --git a/Graphics/GraphicsEngineD3D11/CMakeLists.txt b/Graphics/GraphicsEngineD3D11/CMakeLists.txt index 79bcb0e2..37033c33 100644 --- a/Graphics/GraphicsEngineD3D11/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3D11/CMakeLists.txt @@ -7,7 +7,6 @@ set(INCLUDE include/BufferD3D11Impl.h include/BufferViewD3D11Impl.h include/CommandListD3D11Impl.h - include/D3D11DebugUtilities.h include/D3D11TypeConversions.h include/D3D11TypeDefinitions.h include/DeviceContextD3D11Impl.h @@ -53,7 +52,6 @@ set(SRC src/BufferD3D11Impl.cpp src/BufferViewD3D11Impl.cpp src/CommandListD3D11Impl.cpp - src/D3D11DebugUtilities.cpp src/D3D11TypeConversions.cpp src/DeviceContextD3D11Impl.cpp src/FenceD3D11Impl.cpp diff --git a/Graphics/GraphicsEngineD3D11/include/D3D11DebugUtilities.h b/Graphics/GraphicsEngineD3D11/include/D3D11DebugUtilities.h deleted file mode 100644 index e3849d40..00000000 --- a/Graphics/GraphicsEngineD3D11/include/D3D11DebugUtilities.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2015-2018 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 - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. - * - * 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 -/// Debug utilities - - -namespace Diligent -{ - -} diff --git a/Graphics/GraphicsEngineD3D11/src/D3D11DebugUtilities.cpp b/Graphics/GraphicsEngineD3D11/src/D3D11DebugUtilities.cpp deleted file mode 100644 index 4a9147d8..00000000 --- a/Graphics/GraphicsEngineD3D11/src/D3D11DebugUtilities.cpp +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2015-2018 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 - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. - * - * 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" -#include "D3D11DebugUtilities.h" - - -namespace Diligent -{ - -} diff --git a/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp index b8c84def..0ea85161 100755 --- a/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp @@ -33,7 +33,6 @@ #include "TextureViewD3D11Impl.h" #include "PipelineStateD3D11Impl.h" #include "SwapChainD3D11.h" -#include "D3D11DebugUtilities.h" #include "ShaderResourceBindingD3D11Impl.h" #include "EngineD3D11Attribs.h" #include "EngineD3D11Defines.h" -- cgit v1.2.3