From 00e8dcdb71c6ae3fefd83958ead19b1d72f544e4 Mon Sep 17 00:00:00 2001 From: assiduous Date: Sun, 26 Jan 2020 15:21:35 -0800 Subject: More .h -> .hpp renamings --- Graphics/GraphicsEngineD3DBase/CMakeLists.txt | 2 +- .../include/D3DViewDescConversionImpl.hpp | 2 +- .../include/DXGITypeConversions.h | 41 ---------------------- .../include/DXGITypeConversions.hpp | 41 ++++++++++++++++++++++ .../include/EngineFactoryD3DBase.hpp | 2 +- .../src/DXGITypeConversions.cpp | 2 +- 6 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 Graphics/GraphicsEngineD3DBase/include/DXGITypeConversions.h create mode 100644 Graphics/GraphicsEngineD3DBase/include/DXGITypeConversions.hpp (limited to 'Graphics/GraphicsEngineD3DBase') diff --git a/Graphics/GraphicsEngineD3DBase/CMakeLists.txt b/Graphics/GraphicsEngineD3DBase/CMakeLists.txt index a60f000f..0f208b6d 100644 --- a/Graphics/GraphicsEngineD3DBase/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3DBase/CMakeLists.txt @@ -7,7 +7,7 @@ set(INCLUDE include/D3DShaderResourceLoader.hpp include/D3DTypeConversionImpl.hpp include/D3DViewDescConversionImpl.hpp - include/DXGITypeConversions.h + include/DXGITypeConversions.hpp include/EngineFactoryD3DBase.hpp include/HLSLDefinitions.fxh include/RenderDeviceD3DBase.hpp diff --git a/Graphics/GraphicsEngineD3DBase/include/D3DViewDescConversionImpl.hpp b/Graphics/GraphicsEngineD3DBase/include/D3DViewDescConversionImpl.hpp index 5f6939a8..02f72d86 100644 --- a/Graphics/GraphicsEngineD3DBase/include/D3DViewDescConversionImpl.hpp +++ b/Graphics/GraphicsEngineD3DBase/include/D3DViewDescConversionImpl.hpp @@ -32,7 +32,7 @@ /// This file must be included after D3D11TypeDefinitions.h or D3D12TypeDefinitions.h -#include "DXGITypeConversions.h" +#include "DXGITypeConversions.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3DBase/include/DXGITypeConversions.h b/Graphics/GraphicsEngineD3DBase/include/DXGITypeConversions.h deleted file mode 100644 index 91808f8f..00000000 --- a/Graphics/GraphicsEngineD3DBase/include/DXGITypeConversions.h +++ /dev/null @@ -1,41 +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 -/// Common D3D type conversion utilities - -#include -#include "GraphicsTypes.h" - -namespace Diligent -{ -DXGI_FORMAT TexFormatToDXGI_Format(TEXTURE_FORMAT TexFormat, Uint32 BindFlags = 0); -TEXTURE_FORMAT DXGI_FormatToTexFormat(DXGI_FORMAT DXGIFormat); -DXGI_FORMAT TypeToDXGI_Format(VALUE_TYPE ValType, Uint32 NumComponents, Bool bIsNormalized); -} // namespace Diligent diff --git a/Graphics/GraphicsEngineD3DBase/include/DXGITypeConversions.hpp b/Graphics/GraphicsEngineD3DBase/include/DXGITypeConversions.hpp new file mode 100644 index 00000000..91808f8f --- /dev/null +++ b/Graphics/GraphicsEngineD3DBase/include/DXGITypeConversions.hpp @@ -0,0 +1,41 @@ +/* + * 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 +/// Common D3D type conversion utilities + +#include +#include "GraphicsTypes.h" + +namespace Diligent +{ +DXGI_FORMAT TexFormatToDXGI_Format(TEXTURE_FORMAT TexFormat, Uint32 BindFlags = 0); +TEXTURE_FORMAT DXGI_FormatToTexFormat(DXGI_FORMAT DXGIFormat); +DXGI_FORMAT TypeToDXGI_Format(VALUE_TYPE ValType, Uint32 NumComponents, Bool bIsNormalized); +} // namespace Diligent diff --git a/Graphics/GraphicsEngineD3DBase/include/EngineFactoryD3DBase.hpp b/Graphics/GraphicsEngineD3DBase/include/EngineFactoryD3DBase.hpp index 1e610f62..88680ff5 100644 --- a/Graphics/GraphicsEngineD3DBase/include/EngineFactoryD3DBase.hpp +++ b/Graphics/GraphicsEngineD3DBase/include/EngineFactoryD3DBase.hpp @@ -27,7 +27,7 @@ #pragma once -#include "DXGITypeConversions.h" +#include "DXGITypeConversions.hpp" #include "EngineFactoryBase.hpp" /// \file diff --git a/Graphics/GraphicsEngineD3DBase/src/DXGITypeConversions.cpp b/Graphics/GraphicsEngineD3DBase/src/DXGITypeConversions.cpp index 32f3e60e..a181d534 100644 --- a/Graphics/GraphicsEngineD3DBase/src/DXGITypeConversions.cpp +++ b/Graphics/GraphicsEngineD3DBase/src/DXGITypeConversions.cpp @@ -25,7 +25,7 @@ * of the possibility of such damages. */ -#include "DXGITypeConversions.h" +#include "DXGITypeConversions.hpp" #include "BasicTypes.h" #include "DebugUtilities.h" -- cgit v1.2.3