X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fvk.c;h=5aabed1340874b6216bb4195e845da3b0915c523;hb=6c8e0d1dcf1e08982b54a1b2d2e914e409e09386;hp=9e80dd35ff2a176db276c00344bdf2344c6d5b71;hpb=e123e37a567080a67a1d59837f52cada1b02c951;p=vkrt

diff --git a/src/vk.c b/src/vk.c
index 9e80dd3..5aabed1 100644
--- a/src/vk.c
+++ b/src/vk.c
@@ -1018,7 +1018,7 @@ are_props_supported(struct vk_ctx *ctx, struct vk_att_props *props)
         VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2;
     img_fmt_info.pNext = props->need_export ? &ext_img_fmt_info : 0;
     img_fmt_info.format = props->format;
-    img_fmt_info.type = get_image_type(props->h, props->depth);
+    img_fmt_info.type = VK_IMAGE_TYPE_2D;
     img_fmt_info.tiling = props->tiling;
 
     for (i = 0; i < ARRAY_SIZE(all_flags); i++) {
@@ -1033,8 +1033,7 @@ are_props_supported(struct vk_ctx *ctx, struct vk_att_props *props)
     /* usage can't be null */
     if (flags) {
         img_fmt_info.usage = flags;
-    }
-    else {
+    } else {
         if (!props->is_swapchain) {
             fprintf(stderr, "Unsupported Vulkan format properties: usage.\n");
             return false;
@@ -1064,7 +1063,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 +2036,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 +2155,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;
 }