From 138c1d6be33f069b93dea95c08fcaef9aff9b636 Mon Sep 17 00:00:00 2001
From: Sebastian Gaida <gaida@ca-digit.com>
Date: Tue, 18 May 2021 12:35:52 +0200
Subject: [PATCH] [#16] remove m_ImageFormat

---
 include/vkcv/SwapChain.hpp | 3 ---
 src/vkcv/Core.cpp          | 6 +++---
 src/vkcv/SwapChain.cpp     | 6 +-----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/include/vkcv/SwapChain.hpp b/include/vkcv/SwapChain.hpp
index f0479d7e..1087d636 100644
--- a/include/vkcv/SwapChain.hpp
+++ b/include/vkcv/SwapChain.hpp
@@ -12,7 +12,6 @@ namespace vkcv {
         vk::SurfaceFormatKHR m_format;
 
 		uint32_t m_ImageCount;
-		vk::Format m_ImageFormat;
 
         /**
          * Constructor of a SwapChain object
@@ -65,8 +64,6 @@ namespace vkcv {
 		 * @return number of images in swapchain
 		*/
 		uint32_t getImageCount();
-
-		vk::Format getImageFormat();
     };
 
 }
diff --git a/src/vkcv/Core.cpp b/src/vkcv/Core.cpp
index 2b4fb348..9cc5da70 100644
--- a/src/vkcv/Core.cpp
+++ b/src/vkcv/Core.cpp
@@ -141,8 +141,8 @@ namespace vkcv
 
         for (auto qFamily : qFamilyProperties) {
             int graphicsCount = int(static_cast<uint32_t>(qFamily.queueFlags & vk::QueueFlagBits::eGraphics) != 0) * qFamily.queueCount;
-            int computeCount = int(static_cast<uint32_t>(qFamily.queueFlags & vk::QueueFlagBits::eCompute) != 0) * qFamily.queueCount;;
-            int transferCount = int(static_cast<uint32_t>(qFamily.queueFlags & vk::QueueFlagBits::eTransfer) != 0) * qFamily.queueCount;;
+            int computeCount = int(static_cast<uint32_t>(qFamily.queueFlags & vk::QueueFlagBits::eCompute) != 0) * qFamily.queueCount;
+            int transferCount = int(static_cast<uint32_t>(qFamily.queueFlags & vk::QueueFlagBits::eTransfer) != 0) * qFamily.queueCount;
             queueFamilyStatus.push_back({graphicsCount, computeCount, transferCount});
         }
 
@@ -528,6 +528,6 @@ namespace vkcv
 	}
 
 	vk::Format Core::getSwapchainImageFormat() {
-		return m_swapchain.getImageFormat();
+		return m_swapchain.getSurfaceFormat().format;
 	}
 }
diff --git a/src/vkcv/SwapChain.cpp b/src/vkcv/SwapChain.cpp
index ef182bcd..3483ae37 100644
--- a/src/vkcv/SwapChain.cpp
+++ b/src/vkcv/SwapChain.cpp
@@ -3,7 +3,7 @@
 namespace vkcv {
 
     SwapChain::SwapChain(vk::SurfaceKHR surface, vk::SwapchainKHR swapchain, vk::SurfaceFormatKHR format, uint32_t imageCount)
-        : m_surface(surface), m_swapchain(swapchain), m_format( format), m_ImageCount(imageCount), m_ImageFormat(format.format)
+        : m_surface(surface), m_swapchain(swapchain), m_format( format), m_ImageCount(imageCount)
     {}
 
     const vk::SwapchainKHR& SwapChain::getSwapchain() const {
@@ -168,8 +168,4 @@ namespace vkcv {
 	uint32_t SwapChain::getImageCount() {
 		return m_ImageCount;
 	}
-
-	vk::Format SwapChain::getImageFormat() {
-		return m_ImageFormat;
-	}
 }
-- 
GitLab