diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-11-24 06:30:48 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-11-24 06:30:48 +0000 |
| commit | 0360453045bc3a7f44dd019abaeceb501984e76c (patch) | |
| tree | 264e8adeeed8b80b56034687b287a56e00d8cb10 /Graphics/GraphicsEngineD3D12 | |
| parent | Moved format validation tools to Utilities/FormatValidation (diff) | |
| download | DiligentCore-0360453045bc3a7f44dd019abaeceb501984e76c.tar.gz DiligentCore-0360453045bc3a7f44dd019abaeceb501984e76c.zip | |
Fixed few formatting issues; updated format validation script to make validation pass
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
3 files changed, 6 insertions, 6 deletions
diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.h b/Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.h index 243c508a..38565dda 100644 --- a/Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.h +++ b/Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.h @@ -107,7 +107,7 @@ public: }; ShaderResourceCacheD3D12(DbgCacheContentType dbgContentType) - // clang-format off + // clang-format off #ifdef _DEBUG : m_DbgContentType { diff --git a/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp index 331f8a03..433608fc 100644 --- a/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp @@ -41,21 +41,21 @@ DXGI_FORMAT GetClearFormat(DXGI_FORMAT Fmt, D3D12_RESOURCE_FLAGS Flags) { if (Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL) { + // clang-format off switch (Fmt) { - // clang-format off case DXGI_FORMAT_R32_TYPELESS: return DXGI_FORMAT_D32_FLOAT; case DXGI_FORMAT_R16_TYPELESS: return DXGI_FORMAT_D16_UNORM; case DXGI_FORMAT_R24G8_TYPELESS: return DXGI_FORMAT_D24_UNORM_S8_UINT; case DXGI_FORMAT_R32G8X24_TYPELESS: return DXGI_FORMAT_D32_FLOAT_S8X24_UINT; - // clang-format on } + // clang-format on } else if (Flags & D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET) { + // clang-format off switch (Fmt) { - // clang-format off case DXGI_FORMAT_R32G32B32A32_TYPELESS: return DXGI_FORMAT_R32G32B32A32_FLOAT; case DXGI_FORMAT_R32G32B32_TYPELESS: return DXGI_FORMAT_R32G32B32_FLOAT; case DXGI_FORMAT_R16G16B16A16_TYPELESS: return DXGI_FORMAT_R16G16B16A16_FLOAT; @@ -69,8 +69,8 @@ DXGI_FORMAT GetClearFormat(DXGI_FORMAT Fmt, D3D12_RESOURCE_FLAGS Flags) case DXGI_FORMAT_R8_TYPELESS: return DXGI_FORMAT_R8_UNORM; case DXGI_FORMAT_B8G8R8A8_TYPELESS: return DXGI_FORMAT_B8G8R8A8_UNORM; case DXGI_FORMAT_B8G8R8X8_TYPELESS: return DXGI_FORMAT_B8G8R8X8_UNORM; - // clang-format on } + // clang-format on } return Fmt; } diff --git a/Graphics/GraphicsEngineD3D12/src/TextureViewD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/TextureViewD3D12Impl.cpp index e1ed0372..66e19901 100644 --- a/Graphics/GraphicsEngineD3D12/src/TextureViewD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/TextureViewD3D12Impl.cpp @@ -46,7 +46,7 @@ TextureViewD3D12Impl::TextureViewD3D12Impl(IReferenceCounters* pRefCounte bIsDefaultView }, m_Descriptor{std::move(Descriptor)} - // clang-format on +// clang-format on { if (!TexArraySRVDescriptor.IsNull() && !MipLevelUAVDescriptors.IsNull()) { |