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

xo-imgui: refactor: MinimalImguiVulkan.instance -> instance_

Browse source
This commit is contained in:
Roland Conybeare 2025-11-10 17:03:32 -05:00
commit 0c3b4b10bc
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
xo-imgui/example/ex4a/imgui_ex4a.cpp
View file

@ -4375,7 +4375,7 @@ private:
createInfo.flags |= VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR; createInfo.flags |= VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR;
#endif #endif
int result = vkCreateInstance(&createInfo, nullptr, &instance); int result = vkCreateInstance(&createInfo, nullptr, &(this->instance_));
if (result != VK_SUCCESS) { if (result != VK_SUCCESS) {
printf("vkCreateInstance failed with error: %d\n", result); printf("vkCreateInstance failed with error: %d\n", result);
throw std::runtime_error("Failed to create instance!"); throw std::runtime_error("Failed to create instance!");
@ -4383,21 +4383,21 @@ private:
} }
void createSurface() { void createSurface() {
if (!SDL_Vulkan_CreateSurface(window_, instance, &surface)) { if (!SDL_Vulkan_CreateSurface(window_, instance_, &surface)) {
throw std::runtime_error("Failed to create SDL Vulkan surface!"); throw std::runtime_error("Failed to create SDL Vulkan surface!");
} }
} }
void pickPhysicalDevice() { void pickPhysicalDevice() {
uint32_t deviceCount = 0; uint32_t deviceCount = 0;
vkEnumeratePhysicalDevices(instance, &deviceCount, nullptr); vkEnumeratePhysicalDevices(instance_, &deviceCount, nullptr);
if (deviceCount == 0) { if (deviceCount == 0) {
throw std::runtime_error("Failed to find GPUs with Vulkan support!"); throw std::runtime_error("Failed to find GPUs with Vulkan support!");
} }
std::vector<VkPhysicalDevice> devices(deviceCount); std::vector<VkPhysicalDevice> devices(deviceCount);
vkEnumeratePhysicalDevices(instance, &deviceCount, devices.data()); vkEnumeratePhysicalDevices(instance_, &deviceCount, devices.data());
physicalDevice = devices[0]; // Just pick the first one for simplicity physicalDevice = devices[0]; // Just pick the first one for simplicity
@ -4664,7 +4664,7 @@ private:
// Setup Platform/Renderer backends // Setup Platform/Renderer backends
ImGui_ImplSDL2_InitForVulkan(window_); ImGui_ImplSDL2_InitForVulkan(window_);
ImGui_ImplVulkan_InitInfo init_info = {}; ImGui_ImplVulkan_InitInfo init_info = {};
init_info.Instance = instance; init_info.Instance = instance_;
init_info.PhysicalDevice = physicalDevice; init_info.PhysicalDevice = physicalDevice;
init_info.Device = device; init_info.Device = device;
init_info.QueueFamily = graphicsQueueFamily; init_info.QueueFamily = graphicsQueueFamily;
@ -4931,8 +4931,9 @@ private:
vkDestroyRenderPass(device, renderPass, nullptr); vkDestroyRenderPass(device, renderPass, nullptr);
vkDestroyDescriptorPool(device, descriptorPool, nullptr); vkDestroyDescriptorPool(device, descriptorPool, nullptr);
vkDestroyDevice(device, nullptr); vkDestroyDevice(device, nullptr);
vkDestroySurfaceKHR(instance, surface, nullptr); vkDestroySurfaceKHR(instance_, surface, nullptr);
vkDestroyInstance(instance, nullptr); vkDestroyInstance(instance_, nullptr);
this->instance_ = nullptr;
SDL_DestroyWindow(window_); SDL_DestroyWindow(window_);
this->window_ = nullptr; this->window_ = nullptr;
@ -4943,7 +4944,7 @@ private:
private: private:
SDL_Window* window_ = nullptr; SDL_Window* window_ = nullptr;
VkInstance instance; VkInstance instance_;
VkPhysicalDevice physicalDevice; VkPhysicalDevice physicalDevice;
VkDevice device; VkDevice device;
VkQueue graphicsQueue; VkQueue graphicsQueue;