Fix possible freeze in recreateSwapChain

Overv · Overv · commit ce7d8f87b426 · 2019-11-21T22:07:46.000+01:00
diff --git a/code/16_swap_chain_recreation.cpp b/code/16_swap_chain_recreation.cpp
@@ -191,6 +191,7 @@ class HelloTriangleApplication {
 
     void recreateSwapChain() {
         int width = 0, height = 0;
+        glfwGetFramebufferSize(window, &width, &height);
         while (width == 0 || height == 0) {
             glfwGetFramebufferSize(window, &width, &height);
             glfwWaitEvents();
diff --git a/code/17_vertex_input.cpp b/code/17_vertex_input.cpp
@@ -230,6 +230,7 @@ class HelloTriangleApplication {
 
     void recreateSwapChain() {
         int width = 0, height = 0;
+        glfwGetFramebufferSize(window, &width, &height);
         while (width == 0 || height == 0) {
             glfwGetFramebufferSize(window, &width, &height);
             glfwWaitEvents();
diff --git a/code/18_vertex_buffer.cpp b/code/18_vertex_buffer.cpp
@@ -238,6 +238,7 @@ class HelloTriangleApplication {
 
     void recreateSwapChain() {
         int width = 0, height = 0;
+        glfwGetFramebufferSize(window, &width, &height);
         while (width == 0 || height == 0) {
             glfwGetFramebufferSize(window, &width, &height);
             glfwWaitEvents();
diff --git a/code/19_staging_buffer.cpp b/code/19_staging_buffer.cpp
@@ -238,6 +238,7 @@ class HelloTriangleApplication {
 
     void recreateSwapChain() {
         int width = 0, height = 0;
+        glfwGetFramebufferSize(window, &width, &height);
         while (width == 0 || height == 0) {
             glfwGetFramebufferSize(window, &width, &height);
             glfwWaitEvents();
diff --git a/code/20_index_buffer.cpp b/code/20_index_buffer.cpp
@@ -249,6 +249,7 @@ class HelloTriangleApplication {
 
     void recreateSwapChain() {
         int width = 0, height = 0;
+        glfwGetFramebufferSize(window, &width, &height);
         while (width == 0 || height == 0) {
             glfwGetFramebufferSize(window, &width, &height);
             glfwWaitEvents();
diff --git a/code/21_descriptor_layout.cpp b/code/21_descriptor_layout.cpp
@@ -271,6 +271,7 @@ class HelloTriangleApplication {
 
     void recreateSwapChain() {
         int width = 0, height = 0;
+        glfwGetFramebufferSize(window, &width, &height);
         while (width == 0 || height == 0) {
             glfwGetFramebufferSize(window, &width, &height);
             glfwWaitEvents();
diff --git a/code/22_descriptor_sets.cpp b/code/22_descriptor_sets.cpp
@@ -278,6 +278,7 @@ class HelloTriangleApplication {
 
     void recreateSwapChain() {
         int width = 0, height = 0;
+        glfwGetFramebufferSize(window, &width, &height);
         while (width == 0 || height == 0) {
             glfwGetFramebufferSize(window, &width, &height);
             glfwWaitEvents();
diff --git a/code/23_texture_image.cpp b/code/23_texture_image.cpp
@@ -288,6 +288,7 @@ class HelloTriangleApplication {
 
     void recreateSwapChain() {
         int width = 0, height = 0;
+        glfwGetFramebufferSize(window, &width, &height);
         while (width == 0 || height == 0) {
             glfwGetFramebufferSize(window, &width, &height);
             glfwWaitEvents();
diff --git a/code/24_sampler.cpp b/code/24_sampler.cpp
@@ -295,6 +295,7 @@ class HelloTriangleApplication {
 
     void recreateSwapChain() {
         int width = 0, height = 0;
+        glfwGetFramebufferSize(window, &width, &height);
         while (width == 0 || height == 0) {
             glfwGetFramebufferSize(window, &width, &height);
             glfwWaitEvents();
diff --git a/code/25_texture_mapping.cpp b/code/25_texture_mapping.cpp
@@ -301,6 +301,7 @@ class HelloTriangleApplication {
 
     void recreateSwapChain() {
         int width = 0, height = 0;
+        glfwGetFramebufferSize(window, &width, &height);
         while (width == 0 || height == 0) {
             glfwGetFramebufferSize(window, &width, &height);
             glfwWaitEvents();
diff --git a/code/26_depth_buffering.cpp b/code/26_depth_buffering.cpp
@@ -317,6 +317,7 @@ class HelloTriangleApplication {
 
     void recreateSwapChain() {
         int width = 0, height = 0;
+        glfwGetFramebufferSize(window, &width, &height);
         while (width == 0 || height == 0) {
             glfwGetFramebufferSize(window, &width, &height);
             glfwWaitEvents();
diff --git a/code/27_model_loading.cpp b/code/27_model_loading.cpp
@@ -324,6 +324,7 @@ class HelloTriangleApplication {
 
     void recreateSwapChain() {
         int width = 0, height = 0;
+        glfwGetFramebufferSize(window, &width, &height);
         while (width == 0 || height == 0) {
             glfwGetFramebufferSize(window, &width, &height);
             glfwWaitEvents();
diff --git a/code/28_mipmapping.cpp b/code/28_mipmapping.cpp
@@ -325,6 +325,7 @@ class HelloTriangleApplication {
 
     void recreateSwapChain() {
         int width = 0, height = 0;
+        glfwGetFramebufferSize(window, &width, &height);
         while (width == 0 || height == 0) {
             glfwGetFramebufferSize(window, &width, &height);
             glfwWaitEvents();
diff --git a/code/29_multisampling.cpp b/code/29_multisampling.cpp
@@ -335,6 +335,7 @@ class HelloTriangleApplication {
 
     void recreateSwapChain() {
         int width = 0, height = 0;
+        glfwGetFramebufferSize(window, &width, &height);
         while (width == 0 || height == 0) {
             glfwGetFramebufferSize(window, &width, &height);
             glfwWaitEvents();
diff --git a/en/03_Drawing_a_triangle/04_Swap_chain_recreation.md b/en/03_Drawing_a_triangle/04_Swap_chain_recreation.md
@@ -255,6 +255,7 @@ There is another case where a swap chain may become out of data and that is a sp
 ```c++
 void recreateSwapChain() {
     int width = 0, height = 0;
+    glfwGetFramebufferSize(window, &width, &height);
     while (width == 0 || height == 0) {
         glfwGetFramebufferSize(window, &width, &height);
         glfwWaitEvents();
@@ -266,6 +267,8 @@ void recreateSwapChain() {
 }
 ```
 
+The initial call to `glfwGetFramebufferSize` handles the case where the size is already correct and `glfwWaitEvents` would have nothing to wait on.
+
 Congratulations, you've now finished your very first well-behaved Vulkan
 program! In the next chapter we're going to get rid of the hardcoded vertices in
 the vertex shader and actually use a vertex buffer.
