From 63c91ee81f2e7d6218a424d5856132b3e8c5d8ac Mon Sep 17 00:00:00 2001
From: Eleni Maria Stea <estea@igalia.com>
Date: Sat, 18 Sep 2021 20:41:05 +0300
Subject: [PATCH] fixed bug at cleanup and removed the surface from the
 swapchain struct

---
 src/main.c |    2 +-
 src/vk.c   |    6 +-----
 src/vk.h   |    1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/main.c b/src/main.c
index eb1cf18..36d26e1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -262,8 +262,8 @@ cleanup(void)
     }
 
     vk_destroy_image(&vk_core, &vk_depth_att.obj);
-    vk_destroy_renderer(&vk_core, &vk_rnd);
     vk_destroy_semaphores(&vk_core, &vk_sema);
+    vk_destroy_renderer(&vk_core, &vk_rnd);
 
     if (vk_chain.swapchain) {
         vk_destroy_swapchain(&vk_core, &vk_chain);
diff --git a/src/vk.c b/src/vk.c
index 9e80dd3..bde9972 100644
--- a/src/vk.c
+++ b/src/vk.c
@@ -1064,7 +1064,7 @@ are_props_supported(struct vk_ctx *ctx, struct vk_att_props *props)
 
 static bool
 sc_validate_surface(struct vk_ctx *ctx,
-                 VkSurfaceKHR surf)
+                    VkSurfaceKHR surf)
 {
     VkBool32 supported;
     if (!surf) {
@@ -2037,7 +2037,6 @@ vk_create_swapchain(struct vk_ctx *ctx,
     }
 
     memset(swapchain, 0, sizeof *swapchain);
-    swapchain->surface = surf;
 
     memset(&s_info, 0, sizeof s_info);
     s_info.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR;
@@ -2157,9 +2156,6 @@ vk_destroy_swapchain(struct vk_ctx *ctx,
                      struct vk_swapchain *swapchain)
 {
     vkDestroySwapchainKHR(ctx->dev, swapchain->swapchain, 0);
-    vkDestroySurfaceKHR(ctx->inst, swapchain->surface, 0);
-
-    free(swapchain);
     swapchain = 0;
 }
 
diff --git a/src/vk.h b/src/vk.h
index dfe6aa6..6d4b05e 100644
--- a/src/vk.h
+++ b/src/vk.h
@@ -31,7 +31,6 @@ struct vk_cmd_buffer
 struct vk_swapchain
 {
     VkSwapchainKHR swapchain;
-    VkSurfaceKHR surface;
     VkSurfaceFormatKHR surf_fmt;
 
     /* image properties */
-- 
1.7.10.4