From 31c5692ba8d2d5347a0bd885bc8fbba32addf35e Mon Sep 17 00:00:00 2001
From: OLEGSHA <kvadropups@gmail.com>
Date: Tue, 21 Mar 2023 15:03:48 +0100
Subject: [PATCH] TMP / compacted namespace declarations

---
 desktop/graphics/glfw_mgmt.cpp                  |  6 ++----
 desktop/graphics/glfw_mgmt.h                    |  6 ++----
 desktop/graphics/glfw_mgmt_details.h            |  6 ++----
 desktop/graphics/vulkan_adapter.cpp             | 10 ++++------
 desktop/graphics/vulkan_adapter.h               |  6 ++----
 desktop/graphics/vulkan_buffer.h                |  6 ++----
 desktop/graphics/vulkan_common.cpp              |  6 ++----
 desktop/graphics/vulkan_common.h                |  6 ++----
 desktop/graphics/vulkan_descriptor_set.cpp      |  6 ++----
 desktop/graphics/vulkan_descriptor_set.h        |  6 ++----
 desktop/graphics/vulkan_frame.cpp               |  6 ++----
 desktop/graphics/vulkan_frame.h                 |  6 ++----
 desktop/graphics/vulkan_image.cpp               |  6 ++----
 desktop/graphics/vulkan_image.h                 |  6 ++----
 desktop/graphics/vulkan_mgmt.cpp                |  6 ++----
 desktop/graphics/vulkan_mgmt.h                  |  6 ++----
 desktop/graphics/vulkan_physical_device.cpp     |  6 ++----
 desktop/graphics/vulkan_physical_device.h       |  6 ++----
 desktop/graphics/vulkan_pick_device.cpp         |  6 ++----
 desktop/graphics/vulkan_pick_device.h           |  6 ++----
 desktop/graphics/vulkan_pipeline.cpp            |  6 ++----
 desktop/graphics/vulkan_pipeline.h              |  6 ++----
 desktop/graphics/vulkan_render_pass.cpp         |  6 ++----
 desktop/graphics/vulkan_render_pass.h           |  6 ++----
 desktop/graphics/vulkan_swap_chain.cpp          |  6 ++----
 desktop/graphics/vulkan_swap_chain.h            |  6 ++----
 desktop/graphics/vulkan_texture_descriptors.cpp |  6 ++----
 desktop/graphics/vulkan_texture_descriptors.h   |  6 ++----
 desktop/graphics/vulkan_uniform.h               |  6 ++----
 desktop/graphics/vulkan_uniform.inl             |  6 ++----
 main/game.cpp                                   |  6 ++----
 main/game.h                                     |  6 ++----
 main/logging.cpp                                |  6 ++----
 main/logging.h                                  |  6 ++----
 main/meta.h                                     |  6 ++----
 main/rendering.h                                |  4 +---
 main/rendering/graphics_interface.h             |  6 ++----
 main/rendering/image.cpp                        |  6 ++----
 main/rendering/image.h                          |  6 ++----
 main/util.h                                     |  6 ++----
 40 files changed, 81 insertions(+), 161 deletions(-)

diff --git a/desktop/graphics/glfw_mgmt.cpp b/desktop/graphics/glfw_mgmt.cpp
index 55951de..5f7e7f7 100644
--- a/desktop/graphics/glfw_mgmt.cpp
+++ b/desktop/graphics/glfw_mgmt.cpp
@@ -11,8 +11,7 @@
 #include "vulkan_mgmt.h"
 using namespace progressia::main::logging;
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 static GLFWwindow *window = nullptr;
 
@@ -78,5 +77,4 @@ void onWindowGeometryChange(GLFWwindow *window, [[maybe_unused]] int width,
 
 GLFWwindow *getGLFWWindowHandle() { return window; }
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/glfw_mgmt.h b/desktop/graphics/glfw_mgmt.h
index 16499ee..50b6f04 100644
--- a/desktop/graphics/glfw_mgmt.h
+++ b/desktop/graphics/glfw_mgmt.h
@@ -1,7 +1,6 @@
 #pragma once
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 void initializeGlfw();
 void showWindow();
@@ -9,5 +8,4 @@ void shutdownGlfw();
 bool shouldRun();
 void doGlfwRoutine();
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/glfw_mgmt_details.h b/desktop/graphics/glfw_mgmt_details.h
index 83f8266..1ac290c 100644
--- a/desktop/graphics/glfw_mgmt_details.h
+++ b/desktop/graphics/glfw_mgmt_details.h
@@ -5,10 +5,8 @@
 #define GLFW_INCLUDE_VULKAN
 #include <GLFW/glfw3.h>
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 GLFWwindow *getGLFWWindowHandle();
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_adapter.cpp b/desktop/graphics/vulkan_adapter.cpp
index db496a6..9cbe5d7 100644
--- a/desktop/graphics/vulkan_adapter.cpp
+++ b/desktop/graphics/vulkan_adapter.cpp
@@ -26,8 +26,7 @@
 
 #include <embedded_resources.h>
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 using progressia::main::Vertex;
 
@@ -152,8 +151,8 @@ void Adapter::onPreFrame() {
  * graphics_interface implementation
  */
 
-} // namespace desktop
-namespace main {
+} // namespace progressia::desktop
+namespace progressia::main {
 
 using namespace progressia::desktop;
 
@@ -335,5 +334,4 @@ uint64_t GraphicsInterface::getLastStartedFrame() {
     return static_cast<Vulkan *>(this->backend)->getLastStartedFrame();
 }
 
-} // namespace main
-} // namespace progressia
+} // namespace progressia::main
diff --git a/desktop/graphics/vulkan_adapter.h b/desktop/graphics/vulkan_adapter.h
index 357dcc1..c4b3282 100644
--- a/desktop/graphics/vulkan_adapter.h
+++ b/desktop/graphics/vulkan_adapter.h
@@ -5,8 +5,7 @@
 #include "vulkan_image.h"
 #include "vulkan_uniform.h"
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 class Attachment {
   public:
@@ -67,5 +66,4 @@ class Adapter : public VkObjectWrapper {
     void onPreFrame();
 };
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_buffer.h b/desktop/graphics/vulkan_buffer.h
index 6f3839f..06f8ee2 100644
--- a/desktop/graphics/vulkan_buffer.h
+++ b/desktop/graphics/vulkan_buffer.h
@@ -4,8 +4,7 @@
 
 #include "vulkan_common.h"
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 /*
  * A single buffer with a chunk of allocated memory.
@@ -191,5 +190,4 @@ class IndexedBufferBase : public VkObjectWrapper {
 template <typename Vertex>
 using IndexedBuffer = IndexedBufferBase<Vertex, uint16_t, VK_INDEX_TYPE_UINT16>;
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_common.cpp b/desktop/graphics/vulkan_common.cpp
index 9c84913..77a0962 100644
--- a/desktop/graphics/vulkan_common.cpp
+++ b/desktop/graphics/vulkan_common.cpp
@@ -15,8 +15,7 @@
 
 using namespace progressia::main::logging;
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 /*
  * Vulkan
@@ -769,5 +768,4 @@ void CommandPool::freeMultiUse(VkCommandBuffer buffer) {
     vkFreeCommandBuffers(vulkan.getDevice(), pool, 1, &buffer);
 }
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_common.h b/desktop/graphics/vulkan_common.h
index 064736b..917c3e7 100644
--- a/desktop/graphics/vulkan_common.h
+++ b/desktop/graphics/vulkan_common.h
@@ -22,8 +22,7 @@
 #include "../../main/logging.h"
 #include "../../main/rendering/graphics_interface.h"
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 namespace CstrUtils {
 struct CstrHash {
@@ -288,5 +287,4 @@ class CommandPool : public VkObjectWrapper {
     void freeMultiUse(VkCommandBuffer);
 };
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_descriptor_set.cpp b/desktop/graphics/vulkan_descriptor_set.cpp
index 74fd420..36b5788 100644
--- a/desktop/graphics/vulkan_descriptor_set.cpp
+++ b/desktop/graphics/vulkan_descriptor_set.cpp
@@ -1,7 +1,6 @@
 #include "vulkan_descriptor_set.h"
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 DescriptorSetInterface::DescriptorSetInterface(uint32_t setNumber,
                                                Vulkan &vulkan)
@@ -15,5 +14,4 @@ uint32_t DescriptorSetInterface::getSetNumber() const { return setNumber; }
 
 Vulkan &DescriptorSetInterface::getVulkan() { return vulkan; }
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_descriptor_set.h b/desktop/graphics/vulkan_descriptor_set.h
index 1f23fc8..0bd3245 100644
--- a/desktop/graphics/vulkan_descriptor_set.h
+++ b/desktop/graphics/vulkan_descriptor_set.h
@@ -2,8 +2,7 @@
 
 #include "vulkan_common.h"
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 class DescriptorSetInterface : public VkObjectWrapper {
   protected:
@@ -19,5 +18,4 @@ class DescriptorSetInterface : public VkObjectWrapper {
     Vulkan &getVulkan();
 };
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_frame.cpp b/desktop/graphics/vulkan_frame.cpp
index c7e0355..79b9f31 100644
--- a/desktop/graphics/vulkan_frame.cpp
+++ b/desktop/graphics/vulkan_frame.cpp
@@ -8,8 +8,7 @@
 #include "vulkan_render_pass.h"
 #include "vulkan_swap_chain.h"
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 Frame::Frame(Vulkan &vulkan)
     : vulkan(vulkan),
@@ -170,5 +169,4 @@ void Frame::endRender() {
 
 VkCommandBuffer Frame::getCommandBuffer() { return commandBuffer; }
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_frame.h b/desktop/graphics/vulkan_frame.h
index b5ddaa3..2d1163b 100644
--- a/desktop/graphics/vulkan_frame.h
+++ b/desktop/graphics/vulkan_frame.h
@@ -2,8 +2,7 @@
 
 #include "vulkan_common.h"
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 class Frame : public VkObjectWrapper {
   private:
@@ -32,5 +31,4 @@ class Frame : public VkObjectWrapper {
     VkCommandBuffer getCommandBuffer();
 };
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_image.cpp b/desktop/graphics/vulkan_image.cpp
index 7517df4..b57be5c 100644
--- a/desktop/graphics/vulkan_image.cpp
+++ b/desktop/graphics/vulkan_image.cpp
@@ -9,8 +9,7 @@
 #include "vulkan_pipeline.h"
 #include "vulkan_texture_descriptors.h"
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 /*
  * Image
@@ -243,5 +242,4 @@ void Texture::bind() {
                             &descriptorSet, 0, nullptr);
 }
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_image.h b/desktop/graphics/vulkan_image.h
index a7f1d98..23fb9b8 100644
--- a/desktop/graphics/vulkan_image.h
+++ b/desktop/graphics/vulkan_image.h
@@ -7,8 +7,7 @@
 
 #include "../../main/rendering/image.h"
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 class Image : public VkObjectWrapper {
   public:
@@ -55,5 +54,4 @@ class Texture : public ManagedImage {
     void bind();
 };
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_mgmt.cpp b/desktop/graphics/vulkan_mgmt.cpp
index 55d50dd..9406b55 100644
--- a/desktop/graphics/vulkan_mgmt.cpp
+++ b/desktop/graphics/vulkan_mgmt.cpp
@@ -6,8 +6,7 @@
 #include "../../main/logging.h"
 using namespace progressia::main::logging;
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 Vulkan *vulkan;
 
@@ -67,5 +66,4 @@ void shutdownVulkan() {
     debug("Vulkan terminated");
 }
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_mgmt.h b/desktop/graphics/vulkan_mgmt.h
index f0e76d9..9475db3 100644
--- a/desktop/graphics/vulkan_mgmt.h
+++ b/desktop/graphics/vulkan_mgmt.h
@@ -2,8 +2,7 @@
 
 #include "vulkan_common.h"
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 void initializeVulkan();
 
@@ -19,5 +18,4 @@ void endRender();
 
 void shutdownVulkan();
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_physical_device.cpp b/desktop/graphics/vulkan_physical_device.cpp
index 43676a9..0ce92d6 100644
--- a/desktop/graphics/vulkan_physical_device.cpp
+++ b/desktop/graphics/vulkan_physical_device.cpp
@@ -1,7 +1,6 @@
 #include "vulkan_physical_device.h"
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 PhysicalDevice::PhysicalDevice(VkPhysicalDevice vk) : vk(vk) {
     vkGetPhysicalDeviceProperties(vk, &properties);
@@ -47,5 +46,4 @@ uint32_t PhysicalDevice::getMaxTextureSize() const {
     return getLimits().maxImageDimension2D;
 }
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_physical_device.h b/desktop/graphics/vulkan_physical_device.h
index c229fb1..dc0e997 100644
--- a/desktop/graphics/vulkan_physical_device.h
+++ b/desktop/graphics/vulkan_physical_device.h
@@ -2,8 +2,7 @@
 
 #include "vulkan_common.h"
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 class PhysicalDevice {
 
@@ -31,5 +30,4 @@ class PhysicalDevice {
     uint32_t getMaxTextureSize() const;
 };
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_pick_device.cpp b/desktop/graphics/vulkan_pick_device.cpp
index fe20109..ea19a75 100644
--- a/desktop/graphics/vulkan_pick_device.cpp
+++ b/desktop/graphics/vulkan_pick_device.cpp
@@ -4,8 +4,7 @@
 #include "vulkan_swap_chain.h"
 using namespace progressia::main::logging;
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 namespace {
 
@@ -99,5 +98,4 @@ pickPhysicalDevice(std::vector<PhysicalDevice> &choices, Vulkan &vulkan,
     return *pick;
 }
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_pick_device.h b/desktop/graphics/vulkan_pick_device.h
index 63d21ff..16fa06f 100644
--- a/desktop/graphics/vulkan_pick_device.h
+++ b/desktop/graphics/vulkan_pick_device.h
@@ -5,12 +5,10 @@
 
 #include <vector>
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 const PhysicalDevice &
 pickPhysicalDevice(std::vector<PhysicalDevice> &, Vulkan &,
                    const std::vector<const char *> &deviceExtensions);
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_pipeline.cpp b/desktop/graphics/vulkan_pipeline.cpp
index f2ef8c9..3b2baf3 100644
--- a/desktop/graphics/vulkan_pipeline.cpp
+++ b/desktop/graphics/vulkan_pipeline.cpp
@@ -5,8 +5,7 @@
 #include "vulkan_descriptor_set.h"
 #include "vulkan_render_pass.h"
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 Pipeline::Pipeline(Vulkan &vulkan) : vulkan(vulkan) {
 
@@ -219,5 +218,4 @@ VkPipeline Pipeline::getVk() { return vk; }
 
 VkPipelineLayout Pipeline::getLayout() { return layout; }
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_pipeline.h b/desktop/graphics/vulkan_pipeline.h
index 00b70b9..c4a5294 100644
--- a/desktop/graphics/vulkan_pipeline.h
+++ b/desktop/graphics/vulkan_pipeline.h
@@ -2,8 +2,7 @@
 
 #include "vulkan_common.h"
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 class Pipeline : public VkObjectWrapper {
 
@@ -23,5 +22,4 @@ class Pipeline : public VkObjectWrapper {
     VkPipelineLayout getLayout();
 };
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_render_pass.cpp b/desktop/graphics/vulkan_render_pass.cpp
index b7f7930..1d7de62 100644
--- a/desktop/graphics/vulkan_render_pass.cpp
+++ b/desktop/graphics/vulkan_render_pass.cpp
@@ -3,8 +3,7 @@
 #include "vulkan_adapter.h"
 #include "vulkan_common.h"
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 RenderPass::RenderPass(Vulkan &vulkan) : vulkan(vulkan) {
 
@@ -79,5 +78,4 @@ RenderPass::~RenderPass() {
 
 VkRenderPass RenderPass::getVk() { return vk; }
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_render_pass.h b/desktop/graphics/vulkan_render_pass.h
index 46df7f0..cb1833b 100644
--- a/desktop/graphics/vulkan_render_pass.h
+++ b/desktop/graphics/vulkan_render_pass.h
@@ -2,8 +2,7 @@
 
 #include "vulkan_common.h"
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 class RenderPass : public VkObjectWrapper {
 
@@ -19,5 +18,4 @@ class RenderPass : public VkObjectWrapper {
     VkRenderPass getVk();
 };
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_swap_chain.cpp b/desktop/graphics/vulkan_swap_chain.cpp
index 47d8bb0..fb7c7c1 100644
--- a/desktop/graphics/vulkan_swap_chain.cpp
+++ b/desktop/graphics/vulkan_swap_chain.cpp
@@ -13,8 +13,7 @@
 #include "../../main/logging.h"
 using namespace progressia::main::logging;
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 SwapChain::SupportDetails
 SwapChain::querySwapChainSupport(VkPhysicalDevice device, Vulkan &vulkan) {
@@ -328,5 +327,4 @@ VkFramebuffer SwapChain::getFramebuffer(std::size_t index) const {
 
 VkExtent2D SwapChain::getExtent() const { return extent; }
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_swap_chain.h b/desktop/graphics/vulkan_swap_chain.h
index f938afc..682be8b 100644
--- a/desktop/graphics/vulkan_swap_chain.h
+++ b/desktop/graphics/vulkan_swap_chain.h
@@ -3,8 +3,7 @@
 #include "vulkan_adapter.h"
 #include "vulkan_common.h"
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 class SwapChain : public VkObjectWrapper {
 
@@ -54,5 +53,4 @@ class SwapChain : public VkObjectWrapper {
     VkExtent2D getExtent() const;
 };
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_texture_descriptors.cpp b/desktop/graphics/vulkan_texture_descriptors.cpp
index d1c81a9..bb98ca3 100644
--- a/desktop/graphics/vulkan_texture_descriptors.cpp
+++ b/desktop/graphics/vulkan_texture_descriptors.cpp
@@ -1,7 +1,6 @@
 #include "vulkan_texture_descriptors.h"
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 void TextureDescriptors::allocatePool() {
     pools.resize(pools.size() + 1);
@@ -102,5 +101,4 @@ VkDescriptorSet TextureDescriptors::addTexture(VkImageView view,
     return descriptorSet;
 }
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_texture_descriptors.h b/desktop/graphics/vulkan_texture_descriptors.h
index 9a82462..0b04c82 100644
--- a/desktop/graphics/vulkan_texture_descriptors.h
+++ b/desktop/graphics/vulkan_texture_descriptors.h
@@ -5,8 +5,7 @@
 #include "vulkan_common.h"
 #include "vulkan_descriptor_set.h"
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 class TextureDescriptors : public DescriptorSetInterface {
   private:
@@ -25,5 +24,4 @@ class TextureDescriptors : public DescriptorSetInterface {
     VkDescriptorSet addTexture(VkImageView, VkSampler);
 };
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/desktop/graphics/vulkan_uniform.h b/desktop/graphics/vulkan_uniform.h
index 873e78f..0f29ac3 100644
--- a/desktop/graphics/vulkan_uniform.h
+++ b/desktop/graphics/vulkan_uniform.h
@@ -8,8 +8,7 @@
 #include "vulkan_common.h"
 #include "vulkan_descriptor_set.h"
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 template <typename... Entries> class Uniform : public DescriptorSetInterface {
 
@@ -71,7 +70,6 @@ template <typename... Entries> class Uniform : public DescriptorSetInterface {
     void doUpdates();
 };
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
 
 #include "vulkan_uniform.inl"
diff --git a/desktop/graphics/vulkan_uniform.inl b/desktop/graphics/vulkan_uniform.inl
index 46f884b..5fa2e13 100644
--- a/desktop/graphics/vulkan_uniform.inl
+++ b/desktop/graphics/vulkan_uniform.inl
@@ -7,8 +7,7 @@
 #include "vulkan_pipeline.h"
 #include "vulkan_physical_device.h"
 
-namespace progressia {
-namespace desktop {
+namespace progressia::desktop {
 
 namespace detail {
 
@@ -206,5 +205,4 @@ template <typename... Entries> void Uniform<Entries...>::doUpdates() {
     }
 }
 
-} // namespace desktop
-} // namespace progressia
+} // namespace progressia::desktop
diff --git a/main/game.cpp b/main/game.cpp
index 0540465..6d6ec90 100644
--- a/main/game.cpp
+++ b/main/game.cpp
@@ -16,8 +16,7 @@
 #include "logging.h"
 using namespace progressia::main::logging;
 
-namespace progressia {
-namespace main {
+namespace progressia::main {
 
 std::unique_ptr<Primitive> cube1, cube2;
 std::unique_ptr<Texture> texture1, texture2;
@@ -178,5 +177,4 @@ void shutdown() {
     debug("game shutdown complete");
 }
 
-} // namespace main
-} // namespace progressia
+} // namespace progressia::main
diff --git a/main/game.h b/main/game.h
index 8a1b65e..e7c6e1d 100644
--- a/main/game.h
+++ b/main/game.h
@@ -2,12 +2,10 @@
 
 #include "rendering.h"
 
-namespace progressia {
-namespace main {
+namespace progressia::main {
 
 void initialize(GraphicsInterface &);
 void renderTick();
 void shutdown();
 
-} // namespace main
-} // namespace progressia
+} // namespace progressia::main
diff --git a/main/logging.cpp b/main/logging.cpp
index bbd8e8d..d6fb920 100644
--- a/main/logging.cpp
+++ b/main/logging.cpp
@@ -8,8 +8,7 @@
 #include <mutex>
 #include <sstream>
 
-namespace progressia {
-namespace main {
+namespace progressia::main {
 
 namespace detail {
 
@@ -165,5 +164,4 @@ detail::LogSink fatal(const char *start) { return log(LogLevel::FATAL, start); }
 
 } // namespace logging
 
-} // namespace main
-} // namespace progressia
+} // namespace progressia::main
diff --git a/main/logging.h b/main/logging.h
index 82318ff..6481dd8 100644
--- a/main/logging.h
+++ b/main/logging.h
@@ -3,8 +3,7 @@
 #include "util.h"
 #include <ostream>
 
-namespace progressia {
-namespace main {
+namespace progressia::main {
 
 namespace detail {
 
@@ -60,5 +59,4 @@ detail::LogSink fatal(const char *start = nullptr);
 void initializeLogging();
 void shutdownLogging();
 
-} // namespace main
-} // namespace progressia
+} // namespace progressia::main
diff --git a/main/meta.h b/main/meta.h
index d15fcdd..5a77700 100644
--- a/main/meta.h
+++ b/main/meta.h
@@ -3,8 +3,7 @@
 #include <config.h>
 #include <cstdlib>
 
-namespace progressia {
-namespace main {
+namespace progressia::main {
 namespace meta {
 
 namespace detail {
@@ -37,5 +36,4 @@ constexpr uint32_t VERSION_MINOR = (VERSION_NUMBER & 0x00FF00) >> 8;
 constexpr uint32_t VERSION_PATCH = (VERSION_NUMBER & 0x0000FF) >> 0;
 
 } // namespace meta
-} // namespace main
-} // namespace progressia
+} // namespace progressia::main
diff --git a/main/rendering.h b/main/rendering.h
index 0348577..79fa6f2 100644
--- a/main/rendering.h
+++ b/main/rendering.h
@@ -3,6 +3,4 @@
 #include "rendering/graphics_interface.h"
 #include "rendering/image.h"
 
-namespace progressia {
-namespace main {} // namespace main
-} // namespace progressia
+namespace progressia::main {} // namespace progressia::main
diff --git a/main/rendering/graphics_interface.h b/main/rendering/graphics_interface.h
index 424297f..aff4242 100644
--- a/main/rendering/graphics_interface.h
+++ b/main/rendering/graphics_interface.h
@@ -12,8 +12,7 @@
 
 #include "image.h"
 
-namespace progressia {
-namespace main {
+namespace progressia::main {
 
 struct Vertex {
 
@@ -119,5 +118,4 @@ class GraphicsInterface : private progressia::main::NonCopyable {
     uint64_t getLastStartedFrame();
 };
 
-} // namespace main
-} // namespace progressia
+} // namespace progressia::main
diff --git a/main/rendering/image.cpp b/main/rendering/image.cpp
index f361e28..4f20269 100644
--- a/main/rendering/image.cpp
+++ b/main/rendering/image.cpp
@@ -13,8 +13,7 @@
 #include "../logging.h"
 using namespace progressia::main::logging;
 
-namespace progressia {
-namespace main {
+namespace progressia::main {
 
 std::size_t Image::getSize() const { return data.size(); }
 
@@ -59,5 +58,4 @@ Image loadImage(const std::string &path) {
             data};
 }
 
-} // namespace main
-} // namespace progressia
+} // namespace progressia::main
diff --git a/main/rendering/image.h b/main/rendering/image.h
index 4de6eb9..ec7482e 100644
--- a/main/rendering/image.h
+++ b/main/rendering/image.h
@@ -3,8 +3,7 @@
 #include <filesystem>
 #include <vector>
 
-namespace progressia {
-namespace main {
+namespace progressia::main {
 
 class Image {
   public:
@@ -21,5 +20,4 @@ class Image {
 
 Image loadImage(const std::string &);
 
-} // namespace main
-} // namespace progressia
+} // namespace progressia::main
diff --git a/main/util.h b/main/util.h
index 60b9da9..0dff48a 100644
--- a/main/util.h
+++ b/main/util.h
@@ -29,8 +29,7 @@
 }
 // clang-format on
 
-namespace progressia {
-namespace main {
+namespace progressia::main {
 
 struct NonCopyable {
     NonCopyable &operator=(const NonCopyable &) = delete;
@@ -38,5 +37,4 @@ struct NonCopyable {
     NonCopyable() = default;
 };
 
-} // namespace main
-} // namespace progressia
+} // namespace progressia::main