4 files changed, 30 insertions, 11 deletions

diff --git a/examples/triangle/ex_triangle.c b/examples/triangle/ex_triangle.c
index 1f7ef5e..3a9b7db 100644
--- a/examples/triangle/ex_triangle.c
+++ b/examples/triangle/ex_triangle.c
@@ -53,7 +53,9 @@ int main() {
     static f64 x = 0.0;
     x += 0.01;
 
-    gpu_backend_begin_frame();
+    if (!gpu_backend_begin_frame()) {
+      continue;
+    }
     gpu_cmd_encoder* enc = gpu_get_default_cmd_encoder();
     // begin recording
     gpu_cmd_encoder_begin(*enc);
diff --git a/src/core.c b/src/core.c
index a853637..cd6ff88 100644
--- a/src/core.c
+++ b/src/core.c
@@ -57,8 +57,8 @@ core* core_bringup() {
 #include "input.h"
 #include "render.h"
 
-bool should_window_close(core *core) { glfwWindowShouldClose(core->renderer.window); }
-void core_input_update(core *core) { input_update(&core->input); }
+bool should_window_close(core* core) { glfwWindowShouldClose(core->renderer.window); }
+void core_input_update(core* core) { input_update(&core->input); }
 void core_frame_begin(core* core) { render_frame_begin(&core->renderer); }
 void core_frame_end(core* core) { render_frame_end(&core->renderer); }
 
diff --git a/src/renderer/backends/backend_vulkan.c b/src/renderer/backends/backend_vulkan.c
index 50f9662..5390f1f 100644
--- a/src/renderer/backends/backend_vulkan.c
+++ b/src/renderer/backends/backend_vulkan.c
@@ -51,6 +51,8 @@ typedef struct vulkan_context {
 
   u32 screen_width;
   u32 screen_height;
+  bool is_resizing;
+  GLFWwindow* window;
 
   VkDebugUtilsMessengerEXT vk_debugger;
 } vulkan_context;
@@ -80,6 +82,7 @@ bool gpu_backend_init(const char* window_name, GLFWwindow* window) {
   context.allocator = 0;  // TODO: use an allocator
   context.screen_width = SCREEN_WIDTH;
   context.screen_height = SCREEN_HEIGHT;
+  context.window = window;
   context.current_img_index = 0;
   context.current_frame = 0;
 
@@ -304,7 +307,9 @@ bool gpu_swapchain_create(gpu_swapchain* out_swapchain) {
 
 void gpu_swapchain_destroy(gpu_swapchain* swapchain) {
   // Destroy Framebuffers
+  DEBUG("Image count %d", swapchain->image_count);
   for (u32 i = 0; i < swapchain->image_count; i++) {
+    DEBUG("Framebuffer handle %d", context.swapchain_framebuffers[i]);
     vkDestroyFramebuffer(context.device->logical_device, context.swapchain_framebuffers[i],
                          context.allocator);
   }
@@ -312,11 +317,18 @@ void gpu_swapchain_destroy(gpu_swapchain* swapchain) {
     vkDestroyImageView(context.device->logical_device, swapchain->image_views[i],
                        context.allocator);
   }
-  arena_free_storage(&swapchain->swapchain_arena);
+  arena_free_all(&swapchain->swapchain_arena);
   vkDestroySwapchainKHR(context.device->logical_device, swapchain->handle, context.allocator);
+  TRACE("Vulkan Swapchain destroyed");
 }
 
 static void recreate_swapchain(gpu_swapchain* swapchain) {
+  int width = 0, height = 0;
+  glfwGetFramebufferSize(context.window, &width, &height);
+  while (width == 0 || height == 0) {
+    glfwGetFramebufferSize(context.window, &width, &height);
+    glfwWaitEvents();
+  }
   DEBUG("Recreating swapchain...");
   vkDeviceWaitIdle(context.device->logical_device);
 
@@ -682,27 +694,30 @@ void encode_set_default_settings(gpu_cmd_encoder* encoder) {
 
 // --- Drawing
 
-void gpu_backend_begin_frame() {
+bool gpu_backend_begin_frame() {
   u32 current_frame = context.current_frame;
-  // TRACE("gpu_backend_begin_frame");
   vkWaitForFences(context.device->logical_device, 1, &context.in_flight_fences[current_frame],
                   VK_TRUE, UINT64_MAX);
-  vkResetFences(context.device->logical_device, 1, &context.in_flight_fences[current_frame]);
 
   u32 image_index;
   VkResult result = vkAcquireNextImageKHR(
       context.device->logical_device, context.swapchain->handle, UINT64_MAX,
       context.image_available_semaphores[current_frame], VK_NULL_HANDLE, &image_index);
-  if (result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR) {
+  if (result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR || context.is_resizing) {
+    ERROR("Acquire next image failure. recreate swapchain");
+    context.is_resizing = false;
     recreate_swapchain(context.swapchain);
-    return;
+    return false;
   } else if (result != VK_SUCCESS) {
     ERROR_EXIT("failed to acquire swapchain image");
   }
 
+  vkResetFences(context.device->logical_device, 1, &context.in_flight_fences[current_frame]);
+
   context.current_img_index = image_index;
   /* printf("Current img: %d\n", context.current_img_index); */
   VK_CHECK(vkResetCommandBuffer(context.main_cmd_bufs[current_frame].cmd_buffer, 0));
+  return true;
 }
 
 void gpu_temp_draw() {
@@ -722,6 +737,7 @@ void gpu_backend_end_frame() {
 
   VkResult result = vkQueuePresentKHR(context.device->present_queue, &present_info);
   if (result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR) {
+    ERROR("Queue present error. recreate swapchain");
     recreate_swapchain(context.swapchain);
     return;
   } else if (result != VK_SUCCESS) {
@@ -918,6 +934,7 @@ VkShaderModule create_shader_module(str8 spirv) {
 }
 
 void create_swapchain_framebuffers() {
+  WARN("Recreating framebuffers...");
   u32 image_count = context.swapchain->image_count;
   context.swapchain_framebuffers =
       arena_alloc(&context.swapchain->swapchain_arena, image_count * sizeof(VkFramebuffer));
diff --git a/src/renderer/ral.h b/src/renderer/ral.h
index 416370f..ec9793e 100644
--- a/src/renderer/ral.h
+++ b/src/renderer/ral.h
@@ -69,7 +69,7 @@ bool gpu_backend_init(const char* window_name, struct GLFWwindow* window);
 void gpu_backend_shutdown();
 
 // TEMP
-void gpu_backend_begin_frame();
+bool gpu_backend_begin_frame();
 void gpu_backend_end_frame();
 
 bool gpu_device_create(gpu_device* out_device);
@@ -137,4 +137,4 @@ bytebuffer vertices_as_bytebuffer(arena* a, vertex_format format, vertex_darray*
 
 // TEMP
 
-void gpu_temp_draw();
\ No newline at end of file
+void gpu_temp_draw();