From 4190b09adb68448c1a7eaeccaeaf38dac3946f9d Mon Sep 17 00:00:00 2001
From: Lava Block <the@lava-block.com>
Date: Tue, 12 Jan 2021 23:58:53 +0100
Subject: [PATCH] cleanup

---
 liblava/resource/format.hpp | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/liblava/resource/format.hpp b/liblava/resource/format.hpp
index 48bddaea..ed568a1f 100644
--- a/liblava/resource/format.hpp
+++ b/liblava/resource/format.hpp
@@ -47,22 +47,18 @@ namespace lava {
                                      VkPipelineStageFlags dst_stage_mask,
                                      VkImageSubresourceRange subresource_range);
 
-    VkFormats const request_surface_format_formats = {
-        VK_FORMAT_B8G8R8A8_UNORM,
-        VK_FORMAT_R8G8B8A8_UNORM,
-        VK_FORMAT_B8G8R8_UNORM,
-        VK_FORMAT_R8G8B8_UNORM,
-        VK_FORMAT_B8G8R8A8_SRGB,
-        VK_FORMAT_R8G8B8A8_SRGB,
-        VK_FORMAT_B8G8R8_SRGB,
-        VK_FORMAT_R8G8B8_SRGB,
-    };
-
-    VkColorSpaceKHR const request_surface_format_color_space = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
-
     struct surface_format_request {
-        VkFormats formats = request_surface_format_formats;
-        VkColorSpaceKHR color_space = request_surface_format_color_space;
+        VkFormats formats = {
+            VK_FORMAT_B8G8R8A8_UNORM,
+            VK_FORMAT_R8G8B8A8_UNORM,
+            VK_FORMAT_B8G8R8_UNORM,
+            VK_FORMAT_R8G8B8_UNORM,
+            VK_FORMAT_B8G8R8A8_SRGB,
+            VK_FORMAT_R8G8B8A8_SRGB,
+            VK_FORMAT_B8G8R8_SRGB,
+            VK_FORMAT_R8G8B8_SRGB,
+        };
+        VkColorSpaceKHR color_space = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
     };
     VkSurfaceFormatKHR get_surface_format(VkPhysicalDevice device, VkSurfaceKHR surface, surface_format_request request = {});
 
-- 
GitLab