From 1c9148db32db2c684224ad85e8e30d6583b1f048 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Tue, 19 Oct 2021 15:52:12 -0700 Subject: [PATCH] Minor code review feedback --- DirectXTex/BC.cpp | 2 +- DirectXTex/DirectXTexConvert.cpp | 4 ++-- DirectXTex/filters.h | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DirectXTex/BC.cpp b/DirectXTex/BC.cpp index d4e43be..62ce10a 100644 --- a/DirectXTex/BC.cpp +++ b/DirectXTex/BC.cpp @@ -69,7 +69,7 @@ namespace uint32_t cSteps, uint32_t flags) noexcept { - static const float fEpsilon = (0.25f / 64.0f) * (0.25f / 64.0f); + constexpr float fEpsilon = (0.25f / 64.0f) * (0.25f / 64.0f); static const float pC3[] = { 2.0f / 2.0f, 1.0f / 2.0f, 0.0f / 2.0f }; static const float pD3[] = { 0.0f / 2.0f, 1.0f / 2.0f, 2.0f / 2.0f }; static const float pC4[] = { 3.0f / 3.0f, 2.0f / 3.0f, 1.0f / 3.0f, 0.0f / 3.0f }; diff --git a/DirectXTex/DirectXTexConvert.cpp b/DirectXTex/DirectXTexConvert.cpp index 2e49bf9..99015e8 100644 --- a/DirectXTex/DirectXTexConvert.cpp +++ b/DirectXTex/DirectXTexConvert.cpp @@ -159,8 +159,8 @@ namespace DirectX::XMFLOAT3A tmp; DirectX::XMStoreFloat3A(&tmp, V); - static const float maxf9 = float(0x1FF << 7); - static const float minf9 = float(1.f / (1 << 16)); + constexpr float maxf9 = float(0x1FF << 7); + constexpr float minf9 = float(1.f / (1 << 16)); float x = (tmp.x >= 0.f) ? ((tmp.x > maxf9) ? maxf9 : tmp.x) : 0.f; float y = (tmp.y >= 0.f) ? ((tmp.y > maxf9) ? maxf9 : tmp.y) : 0.f; diff --git a/DirectXTex/filters.h b/DirectXTex/filters.h index ebf9852..a3f0ec2 100644 --- a/DirectXTex/filters.h +++ b/DirectXTex/filters.h @@ -240,11 +240,11 @@ namespace TriangleFilter TriangleRow() noexcept : remaining(0), next(nullptr) {} }; - static const size_t TF_FILTER_SIZE = sizeof(Filter) - sizeof(FilterFrom); - static const size_t TF_FROM_SIZE = sizeof(FilterFrom) - sizeof(FilterTo); - static const size_t TF_TO_SIZE = sizeof(FilterTo); + constexpr size_t TF_FILTER_SIZE = sizeof(Filter) - sizeof(FilterFrom); + constexpr size_t TF_FROM_SIZE = sizeof(FilterFrom) - sizeof(FilterTo); + constexpr size_t TF_TO_SIZE = sizeof(FilterTo); - static const float TF_EPSILON = 0.00001f; + constexpr float TF_EPSILON = 0.00001f; inline HRESULT _Create(_In_ size_t source, _In_ size_t dest, _In_ bool wrap, _Inout_ std::unique_ptr& tf) noexcept {