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/GraphicsEngineD3D11/CMakeLists.txt | 2 +- .../include/D3D11TypeConversions.h | 192 --------------------- .../include/D3D11TypeConversions.hpp | 192 +++++++++++++++++++++ Graphics/GraphicsEngineD3D11/include/pch.h | 2 +- .../GraphicsEngineD3D11/src/BufferD3D11Impl.cpp | 2 +- .../src/D3D11TypeConversions.cpp | 2 +- .../src/DeviceContextD3D11Impl.cpp | 2 +- .../GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp | 2 +- .../src/RenderDeviceD3D11Impl.cpp | 2 +- .../GraphicsEngineD3D11/src/SamplerD3D11Impl.cpp | 2 +- .../GraphicsEngineD3D11/src/Texture1D_D3D11.cpp | 2 +- .../GraphicsEngineD3D11/src/Texture2D_D3D11.cpp | 2 +- .../GraphicsEngineD3D11/src/Texture3D_D3D11.cpp | 2 +- .../GraphicsEngineD3D11/src/TextureBaseD3D11.cpp | 2 +- 14 files changed, 204 insertions(+), 204 deletions(-) delete mode 100644 Graphics/GraphicsEngineD3D11/include/D3D11TypeConversions.h create mode 100644 Graphics/GraphicsEngineD3D11/include/D3D11TypeConversions.hpp (limited to 'Graphics/GraphicsEngineD3D11') diff --git a/Graphics/GraphicsEngineD3D11/CMakeLists.txt b/Graphics/GraphicsEngineD3D11/CMakeLists.txt index 614f6264..91b61477 100644 --- a/Graphics/GraphicsEngineD3D11/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3D11/CMakeLists.txt @@ -7,7 +7,7 @@ set(INCLUDE include/BufferD3D11Impl.hpp include/BufferViewD3D11Impl.hpp include/CommandListD3D11Impl.hpp - include/D3D11TypeConversions.h + include/D3D11TypeConversions.hpp include/D3D11TypeDefinitions.h include/DeviceContextD3D11Impl.hpp include/DisjointQueryPool.hpp diff --git a/Graphics/GraphicsEngineD3D11/include/D3D11TypeConversions.h b/Graphics/GraphicsEngineD3D11/include/D3D11TypeConversions.h deleted file mode 100644 index a2126492..00000000 --- a/Graphics/GraphicsEngineD3D11/include/D3D11TypeConversions.h +++ /dev/null @@ -1,192 +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 -/// Type conversion routines - -#include "GraphicsTypes.h" -#include "DXGITypeConversions.h" - -namespace Diligent -{ - -inline UINT BindFlagsToD3D11BindFlags(Uint32 BindFlags) -{ - // clang-format off - UINT D3D11BindFlags = 0; - D3D11BindFlags = D3D11BindFlags | ((BindFlags & BIND_VERTEX_BUFFER) ? D3D11_BIND_VERTEX_BUFFER : 0); - D3D11BindFlags = D3D11BindFlags | ((BindFlags & BIND_INDEX_BUFFER) ? D3D11_BIND_INDEX_BUFFER : 0); - D3D11BindFlags = D3D11BindFlags | ((BindFlags & BIND_UNIFORM_BUFFER) ? D3D11_BIND_CONSTANT_BUFFER : 0); - D3D11BindFlags = D3D11BindFlags | ((BindFlags & BIND_SHADER_RESOURCE) ? D3D11_BIND_SHADER_RESOURCE : 0); - D3D11BindFlags = D3D11BindFlags | ((BindFlags & BIND_STREAM_OUTPUT) ? D3D11_BIND_STREAM_OUTPUT : 0); - D3D11BindFlags = D3D11BindFlags | ((BindFlags & BIND_RENDER_TARGET) ? D3D11_BIND_RENDER_TARGET : 0); - D3D11BindFlags = D3D11BindFlags | ((BindFlags & BIND_DEPTH_STENCIL) ? D3D11_BIND_DEPTH_STENCIL : 0); - D3D11BindFlags = D3D11BindFlags | ((BindFlags & BIND_UNORDERED_ACCESS) ? D3D11_BIND_UNORDERED_ACCESS : 0); - // clang-format on - return D3D11BindFlags; -} - -inline BIND_FLAGS D3D11BindFlagsToBindFlags(UINT D3D11BindFlags) -{ - BIND_FLAGS BindFlags = BIND_NONE; - // clang-format off - BindFlags = BindFlags | ((D3D11BindFlags & D3D11_BIND_VERTEX_BUFFER) ? BIND_VERTEX_BUFFER : BIND_NONE); - BindFlags = BindFlags | ((D3D11BindFlags & D3D11_BIND_INDEX_BUFFER) ? BIND_INDEX_BUFFER : BIND_NONE); - BindFlags = BindFlags | ((D3D11BindFlags & D3D11_BIND_CONSTANT_BUFFER) ? BIND_UNIFORM_BUFFER : BIND_NONE); - BindFlags = BindFlags | ((D3D11BindFlags & D3D11_BIND_SHADER_RESOURCE) ? BIND_SHADER_RESOURCE : BIND_NONE); - BindFlags = BindFlags | ((D3D11BindFlags & D3D11_BIND_STREAM_OUTPUT) ? BIND_STREAM_OUTPUT : BIND_NONE); - BindFlags = BindFlags | ((D3D11BindFlags & D3D11_BIND_RENDER_TARGET) ? BIND_RENDER_TARGET : BIND_NONE); - BindFlags = BindFlags | ((D3D11BindFlags & D3D11_BIND_DEPTH_STENCIL) ? BIND_DEPTH_STENCIL : BIND_NONE); - BindFlags = BindFlags | ((D3D11BindFlags & D3D11_BIND_UNORDERED_ACCESS) ? BIND_UNORDERED_ACCESS : BIND_NONE); - VERIFY_EXPR( (D3D11BindFlags & - (D3D11_BIND_VERTEX_BUFFER|D3D11_BIND_INDEX_BUFFER|D3D11_BIND_CONSTANT_BUFFER| - D3D11_BIND_SHADER_RESOURCE|D3D11_BIND_STREAM_OUTPUT|D3D11_BIND_RENDER_TARGET| - D3D11_BIND_DEPTH_STENCIL|D3D11_BIND_UNORDERED_ACCESS)) == BindFlagsToD3D11BindFlags(BindFlags)); - // clang-format on - return BindFlags; -} - -D3D11_PRIMITIVE_TOPOLOGY TopologyToD3D11Topology(PRIMITIVE_TOPOLOGY Topology); - -inline D3D11_USAGE UsageToD3D11Usage(USAGE Usage) -{ - switch (Usage) - { - // clang-format off - case USAGE_STATIC: return D3D11_USAGE_IMMUTABLE; - case USAGE_DEFAULT: return D3D11_USAGE_DEFAULT; - case USAGE_DYNAMIC: return D3D11_USAGE_DYNAMIC; - case USAGE_STAGING: return D3D11_USAGE_STAGING; - // clang-format on - default: UNEXPECTED("Unknow usage"); return D3D11_USAGE_DEFAULT; - } -} - -inline USAGE D3D11UsageToUsage(D3D11_USAGE D3D11Usage) -{ - switch (D3D11Usage) - { - // clang-format off - case D3D11_USAGE_IMMUTABLE: return USAGE_STATIC; - case D3D11_USAGE_DEFAULT: return USAGE_DEFAULT; - case D3D11_USAGE_DYNAMIC: return USAGE_DYNAMIC; - case D3D11_USAGE_STAGING: return USAGE_STAGING; - // clang-format on - default: UNEXPECTED("Unknow D3D11 usage"); return USAGE_DEFAULT; - } -} - -inline void MapParamsToD3D11MapParams(MAP_TYPE MapType, Uint32 MapFlags, D3D11_MAP& d3d11MapType, UINT& d3d11MapFlags) -{ - d3d11MapType = static_cast(0); - switch (MapType) - { - case MAP_READ: - d3d11MapType = D3D11_MAP_READ; - break; - - case MAP_WRITE: - if (MapFlags & MAP_FLAG_DISCARD) - d3d11MapType = D3D11_MAP_WRITE_DISCARD; - else if (MapFlags & MAP_FLAG_NO_OVERWRITE) - d3d11MapType = D3D11_MAP_WRITE_NO_OVERWRITE; - else - d3d11MapType = D3D11_MAP_WRITE; - break; - - case MAP_READ_WRITE: - d3d11MapType = D3D11_MAP_READ_WRITE; - break; - - default: - UNEXPECTED("Unknown map type"); - } - - d3d11MapFlags = 0; - d3d11MapFlags |= (MapFlags & MAP_FLAG_DO_NOT_WAIT) ? D3D11_MAP_FLAG_DO_NOT_WAIT : 0; -} - -inline UINT CPUAccessFlagsToD3D11CPUAccessFlags(Uint32 Flags) -{ - UINT D3D11CPUAccessFlags = 0; - D3D11CPUAccessFlags |= (Flags & CPU_ACCESS_READ) ? D3D11_CPU_ACCESS_READ : 0; - D3D11CPUAccessFlags |= (Flags & CPU_ACCESS_WRITE) ? D3D11_CPU_ACCESS_WRITE : 0; - return D3D11CPUAccessFlags; -} - -inline CPU_ACCESS_FLAGS D3D11CPUAccessFlagsToCPUAccessFlags(UINT D3D11CPUAccessFlags) -{ - CPU_ACCESS_FLAGS CPUAccessFlags = CPU_ACCESS_NONE; - CPUAccessFlags |= (D3D11CPUAccessFlags & D3D11_CPU_ACCESS_READ) ? CPU_ACCESS_READ : CPU_ACCESS_NONE; - CPUAccessFlags |= (D3D11CPUAccessFlags & D3D11_CPU_ACCESS_WRITE) ? CPU_ACCESS_WRITE : CPU_ACCESS_NONE; - VERIFY_EXPR(D3D11CPUAccessFlags == CPUAccessFlagsToD3D11CPUAccessFlags(CPUAccessFlags)); - return CPUAccessFlags; -} - -inline UINT MiscTextureFlagsToD3D11Flags(Uint32 Flags) -{ - UINT D3D11MiscFlags = 0; - D3D11MiscFlags |= (Flags & MISC_TEXTURE_FLAG_GENERATE_MIPS) ? D3D11_RESOURCE_MISC_GENERATE_MIPS : 0; - return D3D11MiscFlags; -} - -inline MISC_TEXTURE_FLAGS D3D11MiscFlagsToMiscTextureFlags(UINT D3D11MiscFlags) -{ - MISC_TEXTURE_FLAGS MiscFlags = MISC_TEXTURE_FLAG_NONE; - MiscFlags |= (D3D11MiscFlags & D3D11_RESOURCE_MISC_GENERATE_MIPS) ? MISC_TEXTURE_FLAG_GENERATE_MIPS : MISC_TEXTURE_FLAG_NONE; - return MiscFlags; -} - -D3D11_FILTER FilterTypeToD3D11Filter(FILTER_TYPE MinFilter, FILTER_TYPE MagFilter, FILTER_TYPE MipFilter); - -D3D11_TEXTURE_ADDRESS_MODE TexAddressModeToD3D11AddressMode(TEXTURE_ADDRESS_MODE Mode); - -D3D11_COMPARISON_FUNC ComparisonFuncToD3D11ComparisonFunc(COMPARISON_FUNCTION Func); - -void DepthStencilStateDesc_To_D3D11_DEPTH_STENCIL_DESC(const DepthStencilStateDesc& DepthStencilDesc, - D3D11_DEPTH_STENCIL_DESC& d3d11DSSDesc); - -void RasterizerStateDesc_To_D3D11_RASTERIZER_DESC(const RasterizerStateDesc& RasterizerDesc, - D3D11_RASTERIZER_DESC& d3d11RSDesc); - -void BlendStateDesc_To_D3D11_BLEND_DESC(const BlendStateDesc& BSDesc, - D3D11_BLEND_DESC& D3D11BSDesc); - -void LayoutElements_To_D3D11_INPUT_ELEMENT_DESCs(const InputLayoutDesc& InputLayout, - std::vector>& D3D11InputElements); - -void TextureViewDesc_to_D3D11_SRV_DESC(const TextureViewDesc& TexViewDesc, D3D11_SHADER_RESOURCE_VIEW_DESC& D3D11SRVDesc, Uint32 SampleCount); -void TextureViewDesc_to_D3D11_RTV_DESC(const TextureViewDesc& TexViewDesc, D3D11_RENDER_TARGET_VIEW_DESC& D3D11RTVDesc, Uint32 SampleCount); -void TextureViewDesc_to_D3D11_DSV_DESC(const TextureViewDesc& TexViewDesc, D3D11_DEPTH_STENCIL_VIEW_DESC& D3D11DSVDesc, Uint32 SampleCount); -void TextureViewDesc_to_D3D11_UAV_DESC(const TextureViewDesc& TexViewDesc, D3D11_UNORDERED_ACCESS_VIEW_DESC& D3D11UAVDesc); - -void BufferViewDesc_to_D3D11_SRV_DESC(const BufferDesc& BuffDesc, const BufferViewDesc& SRVDesc, D3D11_SHADER_RESOURCE_VIEW_DESC& D3D11SRVDesc); -void BufferViewDesc_to_D3D11_UAV_DESC(const BufferDesc& BuffDesc, const BufferViewDesc& UAVDesc, D3D11_UNORDERED_ACCESS_VIEW_DESC& D3D11UAVDesc); - -} // namespace Diligent diff --git a/Graphics/GraphicsEngineD3D11/include/D3D11TypeConversions.hpp b/Graphics/GraphicsEngineD3D11/include/D3D11TypeConversions.hpp new file mode 100644 index 00000000..5a87cfd7 --- /dev/null +++ b/Graphics/GraphicsEngineD3D11/include/D3D11TypeConversions.hpp @@ -0,0 +1,192 @@ +/* + * 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 +/// Type conversion routines + +#include "GraphicsTypes.h" +#include "DXGITypeConversions.hpp" + +namespace Diligent +{ + +inline UINT BindFlagsToD3D11BindFlags(Uint32 BindFlags) +{ + // clang-format off + UINT D3D11BindFlags = 0; + D3D11BindFlags = D3D11BindFlags | ((BindFlags & BIND_VERTEX_BUFFER) ? D3D11_BIND_VERTEX_BUFFER : 0); + D3D11BindFlags = D3D11BindFlags | ((BindFlags & BIND_INDEX_BUFFER) ? D3D11_BIND_INDEX_BUFFER : 0); + D3D11BindFlags = D3D11BindFlags | ((BindFlags & BIND_UNIFORM_BUFFER) ? D3D11_BIND_CONSTANT_BUFFER : 0); + D3D11BindFlags = D3D11BindFlags | ((BindFlags & BIND_SHADER_RESOURCE) ? D3D11_BIND_SHADER_RESOURCE : 0); + D3D11BindFlags = D3D11BindFlags | ((BindFlags & BIND_STREAM_OUTPUT) ? D3D11_BIND_STREAM_OUTPUT : 0); + D3D11BindFlags = D3D11BindFlags | ((BindFlags & BIND_RENDER_TARGET) ? D3D11_BIND_RENDER_TARGET : 0); + D3D11BindFlags = D3D11BindFlags | ((BindFlags & BIND_DEPTH_STENCIL) ? D3D11_BIND_DEPTH_STENCIL : 0); + D3D11BindFlags = D3D11BindFlags | ((BindFlags & BIND_UNORDERED_ACCESS) ? D3D11_BIND_UNORDERED_ACCESS : 0); + // clang-format on + return D3D11BindFlags; +} + +inline BIND_FLAGS D3D11BindFlagsToBindFlags(UINT D3D11BindFlags) +{ + BIND_FLAGS BindFlags = BIND_NONE; + // clang-format off + BindFlags = BindFlags | ((D3D11BindFlags & D3D11_BIND_VERTEX_BUFFER) ? BIND_VERTEX_BUFFER : BIND_NONE); + BindFlags = BindFlags | ((D3D11BindFlags & D3D11_BIND_INDEX_BUFFER) ? BIND_INDEX_BUFFER : BIND_NONE); + BindFlags = BindFlags | ((D3D11BindFlags & D3D11_BIND_CONSTANT_BUFFER) ? BIND_UNIFORM_BUFFER : BIND_NONE); + BindFlags = BindFlags | ((D3D11BindFlags & D3D11_BIND_SHADER_RESOURCE) ? BIND_SHADER_RESOURCE : BIND_NONE); + BindFlags = BindFlags | ((D3D11BindFlags & D3D11_BIND_STREAM_OUTPUT) ? BIND_STREAM_OUTPUT : BIND_NONE); + BindFlags = BindFlags | ((D3D11BindFlags & D3D11_BIND_RENDER_TARGET) ? BIND_RENDER_TARGET : BIND_NONE); + BindFlags = BindFlags | ((D3D11BindFlags & D3D11_BIND_DEPTH_STENCIL) ? BIND_DEPTH_STENCIL : BIND_NONE); + BindFlags = BindFlags | ((D3D11BindFlags & D3D11_BIND_UNORDERED_ACCESS) ? BIND_UNORDERED_ACCESS : BIND_NONE); + VERIFY_EXPR( (D3D11BindFlags & + (D3D11_BIND_VERTEX_BUFFER|D3D11_BIND_INDEX_BUFFER|D3D11_BIND_CONSTANT_BUFFER| + D3D11_BIND_SHADER_RESOURCE|D3D11_BIND_STREAM_OUTPUT|D3D11_BIND_RENDER_TARGET| + D3D11_BIND_DEPTH_STENCIL|D3D11_BIND_UNORDERED_ACCESS)) == BindFlagsToD3D11BindFlags(BindFlags)); + // clang-format on + return BindFlags; +} + +D3D11_PRIMITIVE_TOPOLOGY TopologyToD3D11Topology(PRIMITIVE_TOPOLOGY Topology); + +inline D3D11_USAGE UsageToD3D11Usage(USAGE Usage) +{ + switch (Usage) + { + // clang-format off + case USAGE_STATIC: return D3D11_USAGE_IMMUTABLE; + case USAGE_DEFAULT: return D3D11_USAGE_DEFAULT; + case USAGE_DYNAMIC: return D3D11_USAGE_DYNAMIC; + case USAGE_STAGING: return D3D11_USAGE_STAGING; + // clang-format on + default: UNEXPECTED("Unknow usage"); return D3D11_USAGE_DEFAULT; + } +} + +inline USAGE D3D11UsageToUsage(D3D11_USAGE D3D11Usage) +{ + switch (D3D11Usage) + { + // clang-format off + case D3D11_USAGE_IMMUTABLE: return USAGE_STATIC; + case D3D11_USAGE_DEFAULT: return USAGE_DEFAULT; + case D3D11_USAGE_DYNAMIC: return USAGE_DYNAMIC; + case D3D11_USAGE_STAGING: return USAGE_STAGING; + // clang-format on + default: UNEXPECTED("Unknow D3D11 usage"); return USAGE_DEFAULT; + } +} + +inline void MapParamsToD3D11MapParams(MAP_TYPE MapType, Uint32 MapFlags, D3D11_MAP& d3d11MapType, UINT& d3d11MapFlags) +{ + d3d11MapType = static_cast(0); + switch (MapType) + { + case MAP_READ: + d3d11MapType = D3D11_MAP_READ; + break; + + case MAP_WRITE: + if (MapFlags & MAP_FLAG_DISCARD) + d3d11MapType = D3D11_MAP_WRITE_DISCARD; + else if (MapFlags & MAP_FLAG_NO_OVERWRITE) + d3d11MapType = D3D11_MAP_WRITE_NO_OVERWRITE; + else + d3d11MapType = D3D11_MAP_WRITE; + break; + + case MAP_READ_WRITE: + d3d11MapType = D3D11_MAP_READ_WRITE; + break; + + default: + UNEXPECTED("Unknown map type"); + } + + d3d11MapFlags = 0; + d3d11MapFlags |= (MapFlags & MAP_FLAG_DO_NOT_WAIT) ? D3D11_MAP_FLAG_DO_NOT_WAIT : 0; +} + +inline UINT CPUAccessFlagsToD3D11CPUAccessFlags(Uint32 Flags) +{ + UINT D3D11CPUAccessFlags = 0; + D3D11CPUAccessFlags |= (Flags & CPU_ACCESS_READ) ? D3D11_CPU_ACCESS_READ : 0; + D3D11CPUAccessFlags |= (Flags & CPU_ACCESS_WRITE) ? D3D11_CPU_ACCESS_WRITE : 0; + return D3D11CPUAccessFlags; +} + +inline CPU_ACCESS_FLAGS D3D11CPUAccessFlagsToCPUAccessFlags(UINT D3D11CPUAccessFlags) +{ + CPU_ACCESS_FLAGS CPUAccessFlags = CPU_ACCESS_NONE; + CPUAccessFlags |= (D3D11CPUAccessFlags & D3D11_CPU_ACCESS_READ) ? CPU_ACCESS_READ : CPU_ACCESS_NONE; + CPUAccessFlags |= (D3D11CPUAccessFlags & D3D11_CPU_ACCESS_WRITE) ? CPU_ACCESS_WRITE : CPU_ACCESS_NONE; + VERIFY_EXPR(D3D11CPUAccessFlags == CPUAccessFlagsToD3D11CPUAccessFlags(CPUAccessFlags)); + return CPUAccessFlags; +} + +inline UINT MiscTextureFlagsToD3D11Flags(Uint32 Flags) +{ + UINT D3D11MiscFlags = 0; + D3D11MiscFlags |= (Flags & MISC_TEXTURE_FLAG_GENERATE_MIPS) ? D3D11_RESOURCE_MISC_GENERATE_MIPS : 0; + return D3D11MiscFlags; +} + +inline MISC_TEXTURE_FLAGS D3D11MiscFlagsToMiscTextureFlags(UINT D3D11MiscFlags) +{ + MISC_TEXTURE_FLAGS MiscFlags = MISC_TEXTURE_FLAG_NONE; + MiscFlags |= (D3D11MiscFlags & D3D11_RESOURCE_MISC_GENERATE_MIPS) ? MISC_TEXTURE_FLAG_GENERATE_MIPS : MISC_TEXTURE_FLAG_NONE; + return MiscFlags; +} + +D3D11_FILTER FilterTypeToD3D11Filter(FILTER_TYPE MinFilter, FILTER_TYPE MagFilter, FILTER_TYPE MipFilter); + +D3D11_TEXTURE_ADDRESS_MODE TexAddressModeToD3D11AddressMode(TEXTURE_ADDRESS_MODE Mode); + +D3D11_COMPARISON_FUNC ComparisonFuncToD3D11ComparisonFunc(COMPARISON_FUNCTION Func); + +void DepthStencilStateDesc_To_D3D11_DEPTH_STENCIL_DESC(const DepthStencilStateDesc& DepthStencilDesc, + D3D11_DEPTH_STENCIL_DESC& d3d11DSSDesc); + +void RasterizerStateDesc_To_D3D11_RASTERIZER_DESC(const RasterizerStateDesc& RasterizerDesc, + D3D11_RASTERIZER_DESC& d3d11RSDesc); + +void BlendStateDesc_To_D3D11_BLEND_DESC(const BlendStateDesc& BSDesc, + D3D11_BLEND_DESC& D3D11BSDesc); + +void LayoutElements_To_D3D11_INPUT_ELEMENT_DESCs(const InputLayoutDesc& InputLayout, + std::vector>& D3D11InputElements); + +void TextureViewDesc_to_D3D11_SRV_DESC(const TextureViewDesc& TexViewDesc, D3D11_SHADER_RESOURCE_VIEW_DESC& D3D11SRVDesc, Uint32 SampleCount); +void TextureViewDesc_to_D3D11_RTV_DESC(const TextureViewDesc& TexViewDesc, D3D11_RENDER_TARGET_VIEW_DESC& D3D11RTVDesc, Uint32 SampleCount); +void TextureViewDesc_to_D3D11_DSV_DESC(const TextureViewDesc& TexViewDesc, D3D11_DEPTH_STENCIL_VIEW_DESC& D3D11DSVDesc, Uint32 SampleCount); +void TextureViewDesc_to_D3D11_UAV_DESC(const TextureViewDesc& TexViewDesc, D3D11_UNORDERED_ACCESS_VIEW_DESC& D3D11UAVDesc); + +void BufferViewDesc_to_D3D11_SRV_DESC(const BufferDesc& BuffDesc, const BufferViewDesc& SRVDesc, D3D11_SHADER_RESOURCE_VIEW_DESC& D3D11SRVDesc); +void BufferViewDesc_to_D3D11_UAV_DESC(const BufferDesc& BuffDesc, const BufferViewDesc& UAVDesc, D3D11_UNORDERED_ACCESS_VIEW_DESC& D3D11UAVDesc); + +} // namespace Diligent diff --git a/Graphics/GraphicsEngineD3D11/include/pch.h b/Graphics/GraphicsEngineD3D11/include/pch.h index 47017eda..6018b4b8 100644 --- a/Graphics/GraphicsEngineD3D11/include/pch.h +++ b/Graphics/GraphicsEngineD3D11/include/pch.h @@ -76,6 +76,6 @@ #include "DebugUtilities.h" #include "D3DErrors.hpp" #include "RenderDeviceBase.hpp" -#include "D3D11TypeConversions.h" +#include "D3D11TypeConversions.hpp" #include "ValidatedCast.hpp" #include diff --git a/Graphics/GraphicsEngineD3D11/src/BufferD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/BufferD3D11Impl.cpp index 2d2d10b5..bd0eaaf1 100644 --- a/Graphics/GraphicsEngineD3D11/src/BufferD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/BufferD3D11Impl.cpp @@ -31,7 +31,7 @@ #include "BufferD3D11Impl.hpp" #include "RenderDeviceD3D11Impl.hpp" #include "DeviceContextD3D11Impl.hpp" -#include "D3D11TypeConversions.h" +#include "D3D11TypeConversions.hpp" #include "BufferViewD3D11Impl.hpp" #include "GraphicsAccessories.hpp" #include "EngineMemory.h" diff --git a/Graphics/GraphicsEngineD3D11/src/D3D11TypeConversions.cpp b/Graphics/GraphicsEngineD3D11/src/D3D11TypeConversions.cpp index 0d76db58..e717f09d 100644 --- a/Graphics/GraphicsEngineD3D11/src/D3D11TypeConversions.cpp +++ b/Graphics/GraphicsEngineD3D11/src/D3D11TypeConversions.cpp @@ -26,7 +26,7 @@ */ #include "pch.h" -#include "D3D11TypeConversions.h" +#include "D3D11TypeConversions.hpp" #include "D3D11TypeDefinitions.h" #include "D3DTypeConversionImpl.hpp" diff --git a/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp index 0c19756c..f7e8c886 100755 --- a/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp @@ -33,7 +33,7 @@ #include "Texture2D_D3D11.hpp" #include "Texture3D_D3D11.hpp" #include "SamplerD3D11Impl.hpp" -#include "D3D11TypeConversions.h" +#include "D3D11TypeConversions.hpp" #include "TextureViewD3D11Impl.hpp" #include "PipelineStateD3D11Impl.hpp" #include "ShaderResourceBindingD3D11Impl.hpp" diff --git a/Graphics/GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp b/Graphics/GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp index 252697bd..5b11cf12 100644 --- a/Graphics/GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp +++ b/Graphics/GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp @@ -33,7 +33,7 @@ #include "RenderDeviceD3D11Impl.hpp" #include "DeviceContextD3D11Impl.hpp" #include "SwapChainD3D11Impl.hpp" -#include "D3D11TypeConversions.h" +#include "D3D11TypeConversions.hpp" #include "EngineMemory.h" #include "EngineFactoryD3DBase.hpp" #include diff --git a/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp index bcd9bec6..1046f6ff 100644 --- a/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp @@ -34,7 +34,7 @@ #include "Texture2D_D3D11.hpp" #include "Texture3D_D3D11.hpp" #include "SamplerD3D11Impl.hpp" -#include "D3D11TypeConversions.h" +#include "D3D11TypeConversions.hpp" #include "TextureViewD3D11Impl.hpp" #include "PipelineStateD3D11Impl.hpp" #include "ShaderResourceBindingD3D11Impl.hpp" diff --git a/Graphics/GraphicsEngineD3D11/src/SamplerD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/SamplerD3D11Impl.cpp index 6d23f951..8ffe8939 100644 --- a/Graphics/GraphicsEngineD3D11/src/SamplerD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/SamplerD3D11Impl.cpp @@ -28,7 +28,7 @@ #include "pch.h" #include "SamplerD3D11Impl.hpp" #include "RenderDeviceD3D11Impl.hpp" -#include "D3D11TypeConversions.h" +#include "D3D11TypeConversions.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/src/Texture1D_D3D11.cpp b/Graphics/GraphicsEngineD3D11/src/Texture1D_D3D11.cpp index 89104a55..8980db2a 100644 --- a/Graphics/GraphicsEngineD3D11/src/Texture1D_D3D11.cpp +++ b/Graphics/GraphicsEngineD3D11/src/Texture1D_D3D11.cpp @@ -28,7 +28,7 @@ #include "pch.h" #include "Texture1D_D3D11.hpp" #include "RenderDeviceD3D11Impl.hpp" -#include "D3D11TypeConversions.h" +#include "D3D11TypeConversions.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/src/Texture2D_D3D11.cpp b/Graphics/GraphicsEngineD3D11/src/Texture2D_D3D11.cpp index cc36b713..42041ec6 100644 --- a/Graphics/GraphicsEngineD3D11/src/Texture2D_D3D11.cpp +++ b/Graphics/GraphicsEngineD3D11/src/Texture2D_D3D11.cpp @@ -28,7 +28,7 @@ #include "pch.h" #include "Texture2D_D3D11.hpp" #include "RenderDeviceD3D11Impl.hpp" -#include "D3D11TypeConversions.h" +#include "D3D11TypeConversions.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/src/Texture3D_D3D11.cpp b/Graphics/GraphicsEngineD3D11/src/Texture3D_D3D11.cpp index 322043e8..6756f957 100644 --- a/Graphics/GraphicsEngineD3D11/src/Texture3D_D3D11.cpp +++ b/Graphics/GraphicsEngineD3D11/src/Texture3D_D3D11.cpp @@ -28,7 +28,7 @@ #include "pch.h" #include "Texture3D_D3D11.hpp" #include "RenderDeviceD3D11Impl.hpp" -#include "D3D11TypeConversions.h" +#include "D3D11TypeConversions.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp b/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp index 39918856..7a744b57 100644 --- a/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp +++ b/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp @@ -29,7 +29,7 @@ #include "TextureBaseD3D11.hpp" #include "RenderDeviceD3D11Impl.hpp" #include "DeviceContextD3D11Impl.hpp" -#include "D3D11TypeConversions.h" +#include "D3D11TypeConversions.hpp" #include "TextureViewD3D11Impl.hpp" #include "EngineMemory.h" -- cgit v1.2.3