From c97b7ff82d5c0bd7b8cf4955dec2398bd5028c31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=BC=C3=9Fenbach?= Date: Tue, 12 Aug 2025 09:06:23 +0200 Subject: [PATCH] Minor code cleanup (#2253) --- RAII_Samples/utils/utils.hpp | 48 ++++++++++++++++++------------------ samples/utils/utils.cpp | 2 +- samples/utils/utils.hpp | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/RAII_Samples/utils/utils.hpp b/RAII_Samples/utils/utils.hpp index f96779a..9461986 100644 --- a/RAII_Samples/utils/utils.hpp +++ b/RAII_Samples/utils/utils.hpp @@ -101,20 +101,20 @@ namespace vk switch ( oldImageLayout ) { case vk::ImageLayout::eTransferDstOptimal: sourceAccessMask = vk::AccessFlagBits::eTransferWrite; break; - case vk::ImageLayout::ePreinitialized: sourceAccessMask = vk::AccessFlagBits::eHostWrite; break; - case vk::ImageLayout::eGeneral: // sourceAccessMask is empty - case vk::ImageLayout::eUndefined: break; - default: assert( false ); break; + case vk::ImageLayout::ePreinitialized : sourceAccessMask = vk::AccessFlagBits::eHostWrite; break; + case vk::ImageLayout::eGeneral : // sourceAccessMask is empty + case vk::ImageLayout::eUndefined : break; + default : assert( false ); break; } vk::PipelineStageFlags sourceStage; switch ( oldImageLayout ) { case vk::ImageLayout::eGeneral: - case vk::ImageLayout::ePreinitialized: sourceStage = vk::PipelineStageFlagBits::eHost; break; + case vk::ImageLayout::ePreinitialized : sourceStage = vk::PipelineStageFlagBits::eHost; break; case vk::ImageLayout::eTransferDstOptimal: sourceStage = vk::PipelineStageFlagBits::eTransfer; break; - case vk::ImageLayout::eUndefined: sourceStage = vk::PipelineStageFlagBits::eTopOfPipe; break; - default: assert( false ); break; + case vk::ImageLayout::eUndefined : sourceStage = vk::PipelineStageFlagBits::eTopOfPipe; break; + default : assert( false ); break; } vk::AccessFlags destinationAccessMask; @@ -125,24 +125,24 @@ namespace vk destinationAccessMask = vk::AccessFlagBits::eDepthStencilAttachmentRead | vk::AccessFlagBits::eDepthStencilAttachmentWrite; break; case vk::ImageLayout::eGeneral: // empty destinationAccessMask - case vk::ImageLayout::ePresentSrcKHR: break; + case vk::ImageLayout::ePresentSrcKHR : break; case vk::ImageLayout::eShaderReadOnlyOptimal: destinationAccessMask = vk::AccessFlagBits::eShaderRead; break; - case vk::ImageLayout::eTransferSrcOptimal: destinationAccessMask = vk::AccessFlagBits::eTransferRead; break; - case vk::ImageLayout::eTransferDstOptimal: destinationAccessMask = vk::AccessFlagBits::eTransferWrite; break; - default: assert( false ); break; + case vk::ImageLayout::eTransferSrcOptimal : destinationAccessMask = vk::AccessFlagBits::eTransferRead; break; + case vk::ImageLayout::eTransferDstOptimal : destinationAccessMask = vk::AccessFlagBits::eTransferWrite; break; + default : assert( false ); break; } vk::PipelineStageFlags destinationStage; switch ( newImageLayout ) { - case vk::ImageLayout::eColorAttachmentOptimal: destinationStage = vk::PipelineStageFlagBits::eColorAttachmentOutput; break; + case vk::ImageLayout::eColorAttachmentOptimal : destinationStage = vk::PipelineStageFlagBits::eColorAttachmentOutput; break; case vk::ImageLayout::eDepthStencilAttachmentOptimal: destinationStage = vk::PipelineStageFlagBits::eEarlyFragmentTests; break; - case vk::ImageLayout::eGeneral: destinationStage = vk::PipelineStageFlagBits::eHost; break; - case vk::ImageLayout::ePresentSrcKHR: destinationStage = vk::PipelineStageFlagBits::eBottomOfPipe; break; - case vk::ImageLayout::eShaderReadOnlyOptimal: destinationStage = vk::PipelineStageFlagBits::eFragmentShader; break; - case vk::ImageLayout::eTransferDstOptimal: - case vk::ImageLayout::eTransferSrcOptimal: destinationStage = vk::PipelineStageFlagBits::eTransfer; break; - default: assert( false ); break; + case vk::ImageLayout::eGeneral : destinationStage = vk::PipelineStageFlagBits::eHost; break; + case vk::ImageLayout::ePresentSrcKHR : destinationStage = vk::PipelineStageFlagBits::eBottomOfPipe; break; + case vk::ImageLayout::eShaderReadOnlyOptimal : destinationStage = vk::PipelineStageFlagBits::eFragmentShader; break; + case vk::ImageLayout::eTransferDstOptimal : + case vk::ImageLayout::eTransferSrcOptimal : destinationStage = vk::PipelineStageFlagBits::eTransfer; break; + default : assert( false ); break; } vk::ImageAspectFlags aspectMask; @@ -246,9 +246,9 @@ namespace vk vk::raii::Buffer buffer = nullptr; #if !defined( NDEBUG ) private: - vk::DeviceSize m_size; - vk::BufferUsageFlags m_usage; - vk::MemoryPropertyFlags m_propertyFlags; + vk::DeviceSize m_size = 0; + vk::BufferUsageFlags m_usage = {}; + vk::MemoryPropertyFlags m_propertyFlags = {}; #endif }; @@ -342,7 +342,7 @@ namespace vk vk::SurfaceCapabilitiesKHR surfaceCapabilities = physicalDevice.getSurfaceCapabilitiesKHR( surface ); vk::Extent2D swapchainExtent; - if ( surfaceCapabilities.currentExtent.width == (std::numeric_limits::max)() ) + if ( surfaceCapabilities.currentExtent.width == ( std::numeric_limits::max )() ) { // If the surface size is undefined, the size is set to the size of the images requested. swapchainExtent.width = vk::su::clamp( extent.width, surfaceCapabilities.minImageExtent.width, surfaceCapabilities.maxImageExtent.width ); @@ -509,7 +509,7 @@ namespace vk vk::raii::SurfaceKHR const & surface ) { std::vector queueFamilyProperties = physicalDevice.getQueueFamilyProperties(); - assert( queueFamilyProperties.size() < (std::numeric_limits::max)() ); + assert( queueFamilyProperties.size() < ( std::numeric_limits::max )() ); uint32_t graphicsQueueFamilyIndex = vk::su::findGraphicsQueueFamilyIndex( queueFamilyProperties ); if ( physicalDevice.getSurfaceSupportKHR( graphicsQueueFamilyIndex, surface ) ) @@ -896,5 +896,5 @@ namespace vk } } // namespace su - } // namespace raii + } // namespace raii } // namespace vk diff --git a/samples/utils/utils.cpp b/samples/utils/utils.cpp index 1269eee..d671ae8 100644 --- a/samples/utils/utils.cpp +++ b/samples/utils/utils.cpp @@ -993,7 +993,7 @@ namespace vk WindowData::WindowData( GLFWwindow * wnd, std::string const & name, vk::Extent2D const & extent ) : handle{ wnd }, name{ name }, extent{ extent } {} - WindowData::WindowData( WindowData && other ) : handle{}, name{}, extent{} + WindowData::WindowData( WindowData && other ) noexcept : handle{}, name{}, extent{} { std::swap( handle, other.handle ); std::swap( name, other.name ); diff --git a/samples/utils/utils.hpp b/samples/utils/utils.hpp index 7cf92f8..746d81e 100644 --- a/samples/utils/utils.hpp +++ b/samples/utils/utils.hpp @@ -92,7 +92,7 @@ namespace vk { WindowData( GLFWwindow * wnd, std::string const & name, vk::Extent2D const & extent ); WindowData( const WindowData & ) = delete; - WindowData( WindowData && other ); + WindowData( WindowData && other ) noexcept; ~WindowData() noexcept; GLFWwindow * handle;