Replace glfwGetWindowSize with glfwGetFramebufferSize and add back missing chooseSwapExtent text

Overv · Overv · commit 387e4e522d9f · 2018-06-17T17:05:03.000+02:00
diff --git a/03_Drawing_a_triangle/04_Swap_chain_recreation.md b/03_Drawing_a_triangle/04_Swap_chain_recreation.md
@@ -110,6 +110,26 @@ Instead I've opted to clean up the existing command buffers with the
 `vkFreeCommandBuffers` function. This way we can reuse the existing pool to
 allocate the new command buffers.
 
+To handle window resizes properly, we also need to query the current size of the framebuffer to make sure that the swap chain images have the (new) right size. To do that change the `chooseSwapExtent` function to take the actual size into account:
+
+```
+VkExtent2D chooseSwapExtent(const VkSurfaceCapabilitiesKHR& capabilities) {
+    if (capabilities.currentExtent.width != std::numeric_limits<uint32_t>::max()) {
+        return capabilities.currentExtent;
+    } else {
+        int width, height;
+        glfwGetFramebufferSize(window, &width, &height);
+
+        VkExtent2D actualExtent = {
+            static_cast<uint32_t>(width),
+            static_cast<uint32_t>(height)
+        };
+
+        ...
+    }
+}
+```
+
 That's all it takes to recreate the swap chain! However, the disadvantage of
 this approach is that we need to stop all rendering before creating the new swap
 chain. It is possible to create a new swap chain while drawing commands on an
diff --git a/code/16_swap_chain_recreation.cpp b/code/16_swap_chain_recreation.cpp
@@ -750,7 +750,7 @@ class HelloTriangleApplication {
             return capabilities.currentExtent;
         } else {
             int width, height;
-            glfwGetWindowSize(window, &width, &height);
+            glfwGetFramebufferSize(window, &width, &height);
 
             VkExtent2D actualExtent = {
                 static_cast<uint32_t>(width),
diff --git a/code/17_vertex_input.cpp b/code/17_vertex_input.cpp
@@ -795,7 +795,7 @@ class HelloTriangleApplication {
             return capabilities.currentExtent;
         } else {
             int width, height;
-            glfwGetWindowSize(window, &width, &height);
+            glfwGetFramebufferSize(window, &width, &height);
 
             VkExtent2D actualExtent = {
                 static_cast<uint32_t>(width),
diff --git a/code/18_vertex_buffer.cpp b/code/18_vertex_buffer.cpp
@@ -851,7 +851,7 @@ class HelloTriangleApplication {
             return capabilities.currentExtent;
         } else {
             int width, height;
-            glfwGetWindowSize(window, &width, &height);
+            glfwGetFramebufferSize(window, &width, &height);
 
             VkExtent2D actualExtent = {
                 static_cast<uint32_t>(width),
diff --git a/code/19_staging_buffer.cpp b/code/19_staging_buffer.cpp
@@ -899,7 +899,7 @@ class HelloTriangleApplication {
             return capabilities.currentExtent;
         } else {
             int width, height;
-            glfwGetWindowSize(window, &width, &height);
+            glfwGetFramebufferSize(window, &width, &height);
 
             VkExtent2D actualExtent = {
                 static_cast<uint32_t>(width),
diff --git a/code/20_index_buffer.cpp b/code/20_index_buffer.cpp
@@ -932,7 +932,7 @@ class HelloTriangleApplication {
             return capabilities.currentExtent;
         } else {
             int width, height;
-            glfwGetWindowSize(window, &width, &height);
+            glfwGetFramebufferSize(window, &width, &height);
 
             VkExtent2D actualExtent = {
                 static_cast<uint32_t>(width),
diff --git a/code/21_descriptor_layout.cpp b/code/21_descriptor_layout.cpp
@@ -994,7 +994,7 @@ class HelloTriangleApplication {
             return capabilities.currentExtent;
         } else {
             int width, height;
-            glfwGetWindowSize(window, &width, &height);
+            glfwGetFramebufferSize(window, &width, &height);
 
             VkExtent2D actualExtent = {
                 static_cast<uint32_t>(width),
diff --git a/code/22_descriptor_set.cpp b/code/22_descriptor_set.cpp
@@ -1048,7 +1048,7 @@ class HelloTriangleApplication {
             return capabilities.currentExtent;
         } else {
             int width, height;
-            glfwGetWindowSize(window, &width, &height);
+            glfwGetFramebufferSize(window, &width, &height);
 
             VkExtent2D actualExtent = {
                 static_cast<uint32_t>(width),
diff --git a/code/23_texture_image.cpp b/code/23_texture_image.cpp
@@ -1203,7 +1203,7 @@ class HelloTriangleApplication {
             return capabilities.currentExtent;
         } else {
             int width, height;
-            glfwGetWindowSize(window, &width, &height);
+            glfwGetFramebufferSize(window, &width, &height);
 
             VkExtent2D actualExtent = {
                 static_cast<uint32_t>(width),
diff --git a/code/24_sampler.cpp b/code/24_sampler.cpp
@@ -1239,7 +1239,7 @@ class HelloTriangleApplication {
             return capabilities.currentExtent;
         } else {
             int width, height;
-            glfwGetWindowSize(window, &width, &height);
+            glfwGetFramebufferSize(window, &width, &height);
 
             VkExtent2D actualExtent = {
                 static_cast<uint32_t>(width),
diff --git a/code/25_texture_mapping.cpp b/code/25_texture_mapping.cpp
@@ -1269,7 +1269,7 @@ class HelloTriangleApplication {
             return capabilities.currentExtent;
         } else {
             int width, height;
-            glfwGetWindowSize(window, &width, &height);
+            glfwGetFramebufferSize(window, &width, &height);
 
             VkExtent2D actualExtent = {
                 static_cast<uint32_t>(width),
diff --git a/code/26_depth_buffering.cpp b/code/26_depth_buffering.cpp
@@ -1367,7 +1367,7 @@ class HelloTriangleApplication {
             return capabilities.currentExtent;
         } else {
             int width, height;
-            glfwGetWindowSize(window, &width, &height);
+            glfwGetFramebufferSize(window, &width, &height);
 
             VkExtent2D actualExtent = {
                 static_cast<uint32_t>(width),
diff --git a/code/27_model_loading.cpp b/code/27_model_loading.cpp
@@ -1413,7 +1413,7 @@ class HelloTriangleApplication {
             return capabilities.currentExtent;
         } else {
             int width, height;
-            glfwGetWindowSize(window, &width, &height);
+            glfwGetFramebufferSize(window, &width, &height);
 
             VkExtent2D actualExtent = {
                 static_cast<uint32_t>(width),
diff --git a/code/28_mipmapping.cpp b/code/28_mipmapping.cpp
@@ -1499,7 +1499,7 @@ class HelloTriangleApplication {
             return capabilities.currentExtent;
         } else {
             int width, height;
-            glfwGetWindowSize(window, &width, &height);
+            glfwGetFramebufferSize(window, &width, &height);
 
             VkExtent2D actualExtent = {
                 static_cast<uint32_t>(width),
