roland/xo-expression2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-imgui: refactor: streamline create_surface()

Browse source
This commit is contained in:
Roland Conybeare 2025-11-11 00:47:41 -05:00
commit af1a2adbde
2 changed files with 27 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

20
xo-imgui/example/ex4a/VulkanApp.cpp
View file

@ -3,7 +3,8 @@
#include "VulkanApp.hpp"
void
MinimalImGuiVulkan::run() {
MinimalImGuiVulkan::run()
{
this->init_sdl_window();
this->init_vulkan();
this->init_imgui();
@ -12,7 +13,8 @@ MinimalImGuiVulkan::run() {
}
void
MinimalImGuiVulkan::init_sdl_window() {
MinimalImGuiVulkan::init_sdl_window()
{
if (SDL_Init(SDL_INIT_VIDEO) != 0) {
throw std::runtime_error("Failed to initialize SDL!");
}
@ -31,7 +33,8 @@ MinimalImGuiVulkan::init_sdl_window() {
}
void
MinimalImGuiVulkan::init_vulkan() {
MinimalImGuiVulkan::init_vulkan()
{
this->create_instance();
this->create_surface();
this->pick_physical_device();
@ -47,7 +50,8 @@ MinimalImGuiVulkan::init_vulkan() {
}
void
MinimalImGuiVulkan::create_instance() {
MinimalImGuiVulkan::create_instance()
{
VkApplicationInfo appInfo{};
appInfo.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
appInfo.pApplicationName = "ImGui Vulkan App";
@ -91,4 +95,12 @@ MinimalImGuiVulkan::create_instance() {
}
}
void
MinimalImGuiVulkan::create_surface()
{
if (!SDL_Vulkan_CreateSurface(window_, instance_, &(this->surface_))) {
throw std::runtime_error("Failed to create SDL Vulkan surface!");
}
}
/* end VulkanApp.cpp */

23
xo-imgui/example/ex4a/VulkanApp.hpp
View file

@ -31,11 +31,10 @@ private:
*/
void create_instance();
void create_surface() {
if (!SDL_Vulkan_CreateSurface(window_, instance_, &surface)) {
throw std::runtime_error("Failed to create SDL Vulkan surface!");
}
}
/* create vulkan surface.
* populates @ref surface_
*/
void create_surface();
void pick_physical_device() {
uint32_t deviceCount = 0;
@ -59,7 +58,7 @@ private:
for (uint32_t i = 0; i < queueFamilies.size(); i++) {
if (queueFamilies[i].queueFlags & VK_QUEUE_GRAPHICS_BIT) {
VkBool32 presentSupport = false;
vkGetPhysicalDeviceSurfaceSupportKHR(physical_device_, i, surface, &presentSupport);
vkGetPhysicalDeviceSurfaceSupportKHR(physical_device_, i, surface_, &presentSupport);
if (presentSupport) {
graphicsQueueFamily = i;
break;
@ -97,12 +96,12 @@ private:
void create_swapchain() {
VkSurfaceCapabilitiesKHR capabilities;
vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physical_device_, surface, &capabilities);
vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physical_device_, surface_, &capabilities);
uint32_t formatCount;
vkGetPhysicalDeviceSurfaceFormatsKHR(physical_device_, surface, &formatCount, nullptr);
vkGetPhysicalDeviceSurfaceFormatsKHR(physical_device_, surface_, &formatCount, nullptr);
std::vector<VkSurfaceFormatKHR> formats(formatCount);
vkGetPhysicalDeviceSurfaceFormatsKHR(physical_device_, surface, &formatCount, formats.data());
vkGetPhysicalDeviceSurfaceFormatsKHR(physical_device_, surface_, &formatCount, formats.data());
VkSurfaceFormatKHR surfaceFormat = formats[0];
swapchainImageFormat = surfaceFormat.format;
@ -118,7 +117,7 @@ private:
VkSwapchainCreateInfoKHR createInfo{};
createInfo.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR;
createInfo.surface = surface;
createInfo.surface = surface_;
createInfo.minImageCount = imageCount;
createInfo.imageFormat = surfaceFormat.format;
createInfo.imageColorSpace = surfaceFormat.colorSpace;
@ -580,7 +579,7 @@ private:
vkDestroyRenderPass(device, renderPass, nullptr);
vkDestroyDescriptorPool(device, descriptorPool, nullptr);
vkDestroyDevice(device, nullptr);
vkDestroySurfaceKHR(instance_, surface, nullptr);
vkDestroySurfaceKHR(instance_, this->surface_, nullptr);
vkDestroyInstance(instance_, nullptr);
this->instance_ = nullptr;
@ -594,10 +593,10 @@ private:
SDL_Window* window_ = nullptr;
VkInstance instance_;
VkSurfaceKHR surface_;
VkPhysicalDevice physical_device_;
VkDevice device;
VkQueue graphicsQueue;
VkSurfaceKHR surface;
VkSwapchainKHR swapchain;
VkFormat swapchainImageFormat;
VkExtent2D swapchainExtent;