diff --git a/Core/Core/RenderEngine.cpp b/Core/Core/RenderEngine.cpp
index e9bea64..62a1340 100644
--- a/Core/Core/RenderEngine.cpp
+++ b/Core/Core/RenderEngine.cpp
@@ -319,8 +319,12 @@ void RenderEngine::create_swapchain(VkPresentModeKHR desired_present_mode)
 
     VK_CHECK(vkCreateSwapchainKHR(device_, &swapchain_create_info, nullptr, &swapchain_));
 
+    vkGetSwapchainImagesKHR(device_, swapchain_, &image_count, nullptr);
     swapchain_images_.resize(image_count);
     vkGetSwapchainImagesKHR(device_, swapchain_, &image_count, swapchain_images_.data());
+
+    swapchain_image_format_ = surface_format.format;
+    swapchain_extent_ = extent;
 }
 
 void RenderEngine::create_surface()
diff --git a/Core/Core/RenderEngine.h b/Core/Core/RenderEngine.h
index 5ef70bc..383c2b3 100644
--- a/Core/Core/RenderEngine.h
+++ b/Core/Core/RenderEngine.h
@@ -44,6 +44,8 @@ class RenderEngine
     VkQueue present_queue_ = VK_NULL_HANDLE;
     VkSwapchainKHR swapchain_ = VK_NULL_HANDLE;
     std::vector<VkImage> swapchain_images_;
+    VkFormat swapchain_image_format_;
+    VkExtent2D swapchain_extent_;
 
 #ifdef _DEBUG
     VkResult enable_layer_validation(VkDebugUtilsMessengerCreateInfoEXT* create_info);