Changeset 7f60b28 in opengl-game for vulkan-utils.hpp

Timestamp:

Jan 24, 2021, 5:22:33 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

3f32dfd

Parents:

6a39266

Message:

Split VulkanUtils::querySwapChainSupport into three separate functions

File:

• vulkan-utils.hpp (modified) (3 diffs)

vulkan-utils.hpp

@@ -8 +8 @@
 #include <vulkan/vulkan.h>
 
+// TODO: Ideally, vulkan-utils should not have things speciic to windowing apis (glfw, sdl, sfml, etc.).
+// Check what these inclydes are for and if that functionality can be moved
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_vulkan.h>
@@ -20 +22 @@
       return graphicsFamily.has_value() && presentFamily.has_value();
    }
-};
-
-struct SwapChainSupportDetails {
-   VkSurfaceCapabilitiesKHR capabilities;
-   vector<VkSurfaceFormatKHR> formats;
-   vector<VkPresentModeKHR> presentModes;
 };
 
@@ -50 +46 @@
       static bool checkDeviceExtensionSupport(VkPhysicalDevice physicalDevice,
             const vector<const char*>& deviceExtensions);
-      static SwapChainSupportDetails querySwapChainSupport(VkPhysicalDevice physicalDevice,
-            VkSurfaceKHR surface);
-      static VkSurfaceFormatKHR chooseSwapSurfaceFormat(const vector<VkSurfaceFormatKHR>& availableFormats);
-      static VkPresentModeKHR chooseSwapPresentMode(const vector<VkPresentModeKHR>& availablePresentModes);
+      static VkSurfaceCapabilitiesKHR querySwapChainCapabilities(VkPhysicalDevice physicalDevice,
+         VkSurfaceKHR surface);
+      static vector<VkSurfaceFormatKHR> querySwapChainFormats(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface);
+      static vector<VkPresentModeKHR> querySwapChainPresentModes(VkPhysicalDevice physicalDevice,
+         VkSurfaceKHR surface);
+      static VkSurfaceFormatKHR chooseSwapSurfaceFormat(const vector<VkSurfaceFormatKHR>& availableFormats,
+         const vector<VkFormat>& requestedFormats, VkColorSpaceKHR requestedColorSpace);
+      static VkPresentModeKHR chooseSwapPresentMode(const vector<VkPresentModeKHR>& availablePresentModes,
+         const vector<VkPresentModeKHR>& requestedPresentModes);
       static VkExtent2D chooseSwapExtent(const VkSurfaceCapabilitiesKHR& capabilities, int width, int height);
       static VkImageView createImageView(VkDevice device, VkImage image, VkFormat format,