Fix new clang-tidy nags

sndels · Nov 23, 2024 · 313fafa · 313fafa
1 parent 06969d2
commit 313fafa
Show file tree

Hide file tree

Showing 31 changed files with 64 additions and 65 deletions.
diff --git a/src/Window.cpp b/src/Window.cpp
@@ -41,7 +41,7 @@ void deallocatefun(void *block, void *user)
 {
     WHEELS_ASSERT(user != nullptr);
     TlsfAllocator *alloc = static_cast<TlsfAllocator *>(user);
-    return alloc->deallocate(block);
+    alloc->deallocate(block);
 }
 
 } // namespace

diff --git a/src/gfx/DescriptorAllocator.cpp b/src/gfx/DescriptorAllocator.cpp
@@ -142,8 +142,7 @@ void DescriptorAllocator::allocate(
     Span<const char *const> debugNames, Span<vk::DescriptorSet> output)
 {
     WHEELS_ASSERT(m_initialized);
-
-    return allocate(layouts, debugNames, output, nullptr);
+    allocate(layouts, debugNames, output, nullptr);
 }
 
 void DescriptorAllocator::nextPool()

diff --git a/src/gfx/Resources.hpp b/src/gfx/Resources.hpp
@@ -8,7 +8,7 @@
 
 // TODO:
 // Tighter transfer, shader access flags
-enum class BufferState : uint32_t
+enum class BufferState : uint16_t
 {
     Unknown = 0,
 
@@ -133,6 +133,9 @@ template <typename T>
     requires(wheels::SameAs<T, BufferState> || wheels::SameAs<T, ImageState>)
 constexpr T operator|(T lhs, T rhs)
 {
+    // TODO:
+    // Could the valid combinations be easily enumerated?
+    // NOLINTNEXTLINE(clang-analyzer-optin.core.EnumCastOutOfRange)
     return static_cast<T>(
         static_cast<uint64_t>(lhs) | static_cast<uint64_t>(rhs));
 }

diff --git a/src/render/DebugRenderer.cpp b/src/render/DebugRenderer.cpp
@@ -19,7 +19,7 @@ using namespace wheels;
 namespace
 {
 
-enum BindingSet : uint32_t
+enum BindingSet : uint8_t
 {
     CameraBindingSet,
     GeometryBuffersBindingSet,

diff --git a/src/render/DeferredShading.cpp b/src/render/DeferredShading.cpp
@@ -21,7 +21,7 @@ using namespace wheels;
 namespace
 {
 
-enum BindingSet : uint32_t
+enum BindingSet : uint8_t
 {
     LightsBindingSet,
     LightClustersBindingSet,
@@ -85,8 +85,7 @@ void DeferredShading::init(
     WHEELS_ASSERT(!m_initialized);
 
     m_computePass.init(
-        WHEELS_MOV(scopeAlloc),
-        [&dsLayouts](Allocator &alloc)
+        WHEELS_MOV(scopeAlloc), [&dsLayouts](Allocator &alloc)
         { return shaderDefinitionCallback(alloc, dsLayouts.world); },
         ComputePassOptions{
             .storageSetIndex = StorageBindingSet,
@@ -104,8 +103,7 @@ void DeferredShading::recompileShaders(
     WHEELS_ASSERT(m_initialized);
 
     m_computePass.recompileShader(
-        WHEELS_MOV(scopeAlloc), changedFiles,
-        [&dsLayouts](Allocator &alloc)
+        WHEELS_MOV(scopeAlloc), changedFiles, [&dsLayouts](Allocator &alloc)
         { return shaderDefinitionCallback(alloc, dsLayouts.world); },
         externalDsLayouts(dsLayouts));
 }

diff --git a/src/render/ForwardRenderer.cpp b/src/render/ForwardRenderer.cpp
@@ -28,7 +28,7 @@ using namespace wheels;
 namespace
 {
 
-enum BindingSet : uint32_t
+enum BindingSet : uint8_t
 {
     LightsBindingSet,
     LightClustersBindingSet,

diff --git a/src/render/GBufferRenderer.cpp b/src/render/GBufferRenderer.cpp
@@ -28,7 +28,7 @@ namespace
 const vk::Format sAlbedoRoughnessFormat = vk::Format::eR8G8B8A8Unorm;
 const vk::Format sNormalMetalnessFormat = vk::Format::eA2B10G10R10UnormPack32;
 
-enum BindingSet : uint32_t
+enum BindingSet : uint8_t
 {
     CameraBindingSet,
     MaterialDatasBindingSet,

diff --git a/src/render/LightClustering.cpp b/src/render/LightClustering.cpp
@@ -22,7 +22,7 @@ constexpr uint32_t sGroupDim = 16;
 constexpr uint32_t maxPointIndicesPerTile = 128;
 constexpr uint32_t maxSpotIndicesPerTile = 128;
 
-enum BindingSet : uint32_t
+enum BindingSet : uint8_t
 {
     LightsBindingSet,
     CameraBindingSet,

diff --git a/src/render/MeshletCuller.cpp b/src/render/MeshletCuller.cpp
@@ -32,7 +32,7 @@ const uint32_t sMaxRecordsPerFrame = 2;
 
 const uint32_t sMaxHierarchicalDepthMips = 12;
 
-enum GeneratorBindingSet : uint32_t
+enum GeneratorBindingSet : uint8_t
 {
     GeneratorGeometryBindingSet,
     GeneratorSceneInstancesBindingSet,
@@ -42,7 +42,7 @@ enum GeneratorBindingSet : uint32_t
     GeneratorBindingSetCount,
 };
 
-enum CullerBindingSet : uint32_t
+enum CullerBindingSet : uint8_t
 {
     CullerCameraBindingSet,
     CullerGeometryBindingSet,
@@ -146,8 +146,7 @@ void MeshletCuller::init(
     WHEELS_ASSERT(!m_initialized);
 
     m_drawListGenerator.init(
-        scopeAlloc.child_scope(),
-        [&worldDsLayouts](Allocator &alloc)
+        scopeAlloc.child_scope(), [&worldDsLayouts](Allocator &alloc)
         { return generatorDefinitionCallback(alloc, worldDsLayouts); },
         ComputePassOptions{
             .storageSetIndex = GeneratorStorageBindingSet,

diff --git a/src/render/MeshletCuller.hpp b/src/render/MeshletCuller.hpp
@@ -48,7 +48,7 @@ class MeshletCuller
 
     void startFrame();
 
-    enum class Mode
+    enum class Mode : uint8_t
     {
         Opaque,
         Transparent,

diff --git a/src/render/RtReference.cpp b/src/render/RtReference.cpp
@@ -27,7 +27,7 @@ namespace
 
 constexpr uint32_t sFramePeriod = 4096;
 
-enum BindingSet : uint32_t
+enum BindingSet : uint8_t
 {
     CameraBindingSet,
     RTBindingSet,
@@ -47,15 +47,15 @@ constexpr vk::ShaderStageFlags sVkShaderStageFlagsAllRt =
     vk::ShaderStageFlagBits::eMissKHR |
     vk::ShaderStageFlagBits::eIntersectionKHR;
 
-enum class StageIndex : uint32_t
+enum class StageIndex : uint8_t
 {
     RayGen,
     ClosestHit,
     AnyHit,
     Miss,
 };
 
-enum class GroupIndex : uint32_t
+enum class GroupIndex : uint8_t
 {
     RayGen,
     Hit,

diff --git a/src/render/SkyboxRenderer.cpp b/src/render/SkyboxRenderer.cpp
@@ -18,7 +18,7 @@ using namespace wheels;
 namespace
 {
 
-enum BindingSet : uint32_t
+enum BindingSet : uint8_t
 {
     SkyboxBindingSet,
     CameraBindingSet,

diff --git a/src/render/TemporalAntiAliasing.cpp b/src/render/TemporalAntiAliasing.cpp
@@ -27,7 +27,7 @@ constexpr StaticArray<
     static_cast<size_t>(TemporalAntiAliasing::VelocitySamplingType::Count)>
     sVelocitySamplingTypeNames{{VELOCITY_SAMPLING_TYPE_STRS}};
 
-enum BindingSet : uint32_t
+enum BindingSet : uint8_t
 {
     CameraBindingSet,
     StorageBindingSet,

diff --git a/src/render/TemporalAntiAliasing.hpp b/src/render/TemporalAntiAliasing.hpp
@@ -25,12 +25,12 @@
 class TemporalAntiAliasing
 {
   public:
-    enum class ColorClippingType : uint32_t
+    enum class ColorClippingType : uint8_t
     {
         COLOR_CLIPPING_TYPES_AND_COUNT
     };
 
-    enum class VelocitySamplingType : uint32_t
+    enum class VelocitySamplingType : uint8_t
     {
         VELOCITY_SAMPLING_TYPES_AND_COUNT
     };

diff --git a/src/render/TextureDebug.hpp b/src/render/TextureDebug.hpp
@@ -27,7 +27,7 @@
 class TextureDebug
 {
   public:
-    enum class ChannelType : uint32_t
+    enum class ChannelType : uint8_t
     {
         TEXTURE_DEBUG_CHANNEL_TYPES_AND_COUNT
     };

diff --git a/src/render/dof/DepthOfFieldGather.hpp b/src/render/dof/DepthOfFieldGather.hpp
@@ -14,7 +14,7 @@
 class DepthOfFieldGather
 {
   public:
-    enum GatherType : uint32_t
+    enum GatherType : uint8_t
     {
         GatherType_Foreground,
         GatherType_Background,

diff --git a/src/render/dof/DepthOfFieldSetup.cpp b/src/render/dof/DepthOfFieldSetup.cpp
@@ -17,7 +17,7 @@ using namespace wheels;
 namespace
 {
 
-enum BindingSet : uint32_t
+enum BindingSet : uint8_t
 {
     CameraBindingSet,
     StorageBindingSet,

diff --git a/src/render/rtdi/RtDiInitialReservoirs.cpp b/src/render/rtdi/RtDiInitialReservoirs.cpp
@@ -20,7 +20,7 @@ namespace
 
 constexpr uint32_t sFramePeriod = 4096;
 
-enum BindingSet : uint32_t
+enum BindingSet : uint8_t
 {
     LightsBindingSet,
     CameraBindingSet,
@@ -67,8 +67,7 @@ void RtDiInitialReservoirs::init(
     WHEELS_ASSERT(!m_initialized);
 
     m_computePass.init(
-        WHEELS_MOV(scopeAlloc),
-        [&dsLayouts](Allocator &alloc)
+        WHEELS_MOV(scopeAlloc), [&dsLayouts](Allocator &alloc)
         { return shaderDefinitionCallback(alloc, dsLayouts.world); },
         ComputePassOptions{
             .storageSetIndex = StorageBindingSet,
@@ -86,8 +85,7 @@ bool RtDiInitialReservoirs::recompileShaders(
     WHEELS_ASSERT(m_initialized);
 
     return m_computePass.recompileShader(
-        WHEELS_MOV(scopeAlloc), changedFiles,
-        [&dsLayouts](Allocator &alloc)
+        WHEELS_MOV(scopeAlloc), changedFiles, [&dsLayouts](Allocator &alloc)
         { return shaderDefinitionCallback(alloc, dsLayouts.world); },
         externalDsLayouts(dsLayouts));
 }

diff --git a/src/render/rtdi/RtDiSpatialReuse.cpp b/src/render/rtdi/RtDiSpatialReuse.cpp
@@ -20,7 +20,7 @@ namespace
 
 constexpr uint32_t sFramePeriod = 4096;
 
-enum BindingSet : uint32_t
+enum BindingSet : uint8_t
 {
     LightsBindingSet,
     CameraBindingSet,
@@ -67,8 +67,7 @@ void RtDiSpatialReuse::init(
     WHEELS_ASSERT(!m_initialized);
 
     m_computePass.init(
-        WHEELS_MOV(scopeAlloc),
-        [&dsLayouts](Allocator &alloc)
+        WHEELS_MOV(scopeAlloc), [&dsLayouts](Allocator &alloc)
         { return shaderDefinitionCallback(alloc, dsLayouts.world); },
         ComputePassOptions{
             .storageSetIndex = StorageBindingSet,
@@ -86,8 +85,7 @@ bool RtDiSpatialReuse::recompileShaders(
     WHEELS_ASSERT(m_initialized);
 
     return m_computePass.recompileShader(
-        WHEELS_MOV(scopeAlloc), changedFiles,
-        [&dsLayouts](Allocator &alloc)
+        WHEELS_MOV(scopeAlloc), changedFiles, [&dsLayouts](Allocator &alloc)
         { return shaderDefinitionCallback(alloc, dsLayouts.world); },
         externalDsLayouts(dsLayouts));
 }

diff --git a/src/render/rtdi/RtDiTrace.cpp b/src/render/rtdi/RtDiTrace.cpp
@@ -27,7 +27,7 @@ namespace
 
 constexpr uint32_t sFramePeriod = 4096;
 
-enum BindingSet : uint32_t
+enum BindingSet : uint8_t
 {
     CameraBindingSet,
     RTBindingSet,
@@ -47,15 +47,15 @@ constexpr vk::ShaderStageFlags sVkShaderStageFlagsAllRt =
     vk::ShaderStageFlagBits::eMissKHR |
     vk::ShaderStageFlagBits::eIntersectionKHR;
 
-enum class StageIndex : uint32_t
+enum class StageIndex : uint8_t
 {
     RayGen,
     ClosestHit,
     AnyHit,
     Miss,
 };
 
-enum class GroupIndex : uint32_t
+enum class GroupIndex : uint8_t
 {
     RayGen,
     Hit,

diff --git a/src/scene/Animations.hpp b/src/scene/Animations.hpp
@@ -10,7 +10,7 @@
 #include <glm/gtc/quaternion.hpp>
 #include <wheels/containers/array.hpp>
 
-enum class InterpolationType
+enum class InterpolationType : uint8_t
 {
     Step,
     Linear,

diff --git a/src/scene/DeferredLoadingContext.hpp b/src/scene/DeferredLoadingContext.hpp
@@ -24,7 +24,7 @@
 #include <wheels/containers/static_array.hpp>
 #include <wheels/containers/string.hpp>
 
-enum class IndicesType
+enum class IndicesType : uint8_t
 {
     Uint8,
     Uint16,

diff --git a/src/scene/DrawType.hpp b/src/scene/DrawType.hpp
@@ -15,7 +15,7 @@
 
 #define DRAW_TYPES_STRS FOR_EACH(DRAW_TYPES_STRINGIFY, DRAW_TYPES)
 
-enum class DrawType : uint32_t
+enum class DrawType : uint8_t
 {
     DRAW_TYPES_AND_COUNT
 };

diff --git a/src/scene/World.cpp b/src/scene/World.cpp
@@ -982,7 +982,7 @@ bool World::unbuiltBlases() const
 void World::drawDeferredLoadingUi() const
 {
     WHEELS_ASSERT(m_initialized);
-    return m_impl->m_data.drawDeferredLoadingUi();
+    m_impl->m_data.drawDeferredLoadingUi();
 }
 
 bool World::drawSceneUi()

diff --git a/src/scene/WorldData.cpp b/src/scene/WorldData.cpp
@@ -47,7 +47,7 @@ void *cgltf_alloc_func(void *user, cgltf_size size)
 void cgltf_free_func(void *user, void *ptr)
 {
     Allocator *alloc = static_cast<Allocator *>(user);
-    return alloc->deallocate(ptr);
+    alloc->deallocate(ptr);
 }
 
 const StaticArray sCgltfResultStr{{
@@ -1488,13 +1488,10 @@ void WorldData::gatherScene(
 
                     // Angular attenuation rom gltf spec
                     const auto angleScale =
-                        1.f /
-                        max(0.001f, static_cast<float>(
-                                        cos(light.spot_inner_cone_angle) -
-                                        cos(light.spot_outer_cone_angle)));
+                        1.f / max(0.001f, cos(light.spot_inner_cone_angle) -
+                                              cos(light.spot_outer_cone_angle));
                     const auto angleOffset =
-                        static_cast<float>(-cos(light.spot_outer_cone_angle)) *
-                        angleScale;
+                        -cos(light.spot_outer_cone_angle) * angleScale;
 
                     sceneLight.radianceAndAngleScale =
                         vec4{