Merge pull request #66 from iaz3/patch-2

Overv · web-flow · commit e962d1a89a77 · 2017-12-25T11:57:58.000+01:00
Fix Image View and Sampler code and beyond missing swapChainAdequate check
diff --git a/06_Texture_mapping/01_Image_view_and_sampler.md b/06_Texture_mapping/01_Image_view_and_sampler.md
@@ -333,7 +333,7 @@ bool isDeviceSuitable(VkPhysicalDevice device) {
     VkPhysicalDeviceFeatures supportedFeatures;
     vkGetPhysicalDeviceFeatures(device, &supportedFeatures);
 
-    return indices.isComplete() && extensionsSupported && supportedFeatures.samplerAnisotropy;
+    return indices.isComplete() && extensionsSupported && swapChainAdequate && supportedFeatures.samplerAnisotropy;
 }
 ```
 
diff --git a/code/depth_buffering.cpp b/code/depth_buffering.cpp
@@ -1398,7 +1398,7 @@ class HelloTriangleApplication {
         VkPhysicalDeviceFeatures supportedFeatures;
         vkGetPhysicalDeviceFeatures(device, &supportedFeatures);
 
-        return indices.isComplete() && extensionsSupported && supportedFeatures.samplerAnisotropy;
+        return indices.isComplete() && extensionsSupported && swapChainAdequate && supportedFeatures.samplerAnisotropy;
     }
 
     bool checkDeviceExtensionSupport(VkPhysicalDevice device) {
diff --git a/code/model_loading.cpp b/code/model_loading.cpp
@@ -1444,7 +1444,7 @@ class HelloTriangleApplication {
         VkPhysicalDeviceFeatures supportedFeatures;
         vkGetPhysicalDeviceFeatures(device, &supportedFeatures);
 
-        return indices.isComplete() && extensionsSupported && supportedFeatures.samplerAnisotropy;
+        return indices.isComplete() && extensionsSupported && swapChainAdequate  && supportedFeatures.samplerAnisotropy;
     }
 
     bool checkDeviceExtensionSupport(VkPhysicalDevice device) {
diff --git a/code/sampler.cpp b/code/sampler.cpp
@@ -1270,7 +1270,7 @@ class HelloTriangleApplication {
         VkPhysicalDeviceFeatures supportedFeatures;
         vkGetPhysicalDeviceFeatures(device, &supportedFeatures);
 
-        return indices.isComplete() && extensionsSupported && supportedFeatures.samplerAnisotropy;
+        return indices.isComplete() && extensionsSupported && swapChainAdequate && supportedFeatures.samplerAnisotropy;
     }
 
     bool checkDeviceExtensionSupport(VkPhysicalDevice device) {
diff --git a/code/texture_mapping.cpp b/code/texture_mapping.cpp
@@ -1300,7 +1300,7 @@ class HelloTriangleApplication {
         VkPhysicalDeviceFeatures supportedFeatures;
         vkGetPhysicalDeviceFeatures(device, &supportedFeatures);
 
-        return indices.isComplete() && extensionsSupported && supportedFeatures.samplerAnisotropy;
+        return indices.isComplete() && extensionsSupported && swapChainAdequate && supportedFeatures.samplerAnisotropy;
     }
 
     bool checkDeviceExtensionSupport(VkPhysicalDevice device) {

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ bool isDeviceSuitable(VkPhysicalDevice device) {`
`333`	`333`	`VkPhysicalDeviceFeatures supportedFeatures;`
`334`	`334`	`vkGetPhysicalDeviceFeatures(device, &supportedFeatures);`
`335`	`335`
`336`		`- return indices.isComplete() && extensionsSupported && supportedFeatures.samplerAnisotropy;`
	`336`	`+ return indices.isComplete() && extensionsSupported && swapChainAdequate && supportedFeatures.samplerAnisotropy;`
`337`	`337`	`}`
`338`	`338`	```
`339`	`339`
Original file line number	Diff line number	Diff line change
`@@ -1398,7 +1398,7 @@ class HelloTriangleApplication {`
`1398`	`1398`	`VkPhysicalDeviceFeatures supportedFeatures;`
`1399`	`1399`	`vkGetPhysicalDeviceFeatures(device, &supportedFeatures);`
`1400`	`1400`
`1401`		`- return indices.isComplete() && extensionsSupported && supportedFeatures.samplerAnisotropy;`
	`1401`	`+ return indices.isComplete() && extensionsSupported && swapChainAdequate && supportedFeatures.samplerAnisotropy;`
`1402`	`1402`	`}`
`1403`	`1403`
`1404`	`1404`	`bool checkDeviceExtensionSupport(VkPhysicalDevice device) {`
Original file line number	Diff line number	Diff line change
`@@ -1444,7 +1444,7 @@ class HelloTriangleApplication {`
`1444`	`1444`	`VkPhysicalDeviceFeatures supportedFeatures;`
`1445`	`1445`	`vkGetPhysicalDeviceFeatures(device, &supportedFeatures);`
`1446`	`1446`
`1447`		`- return indices.isComplete() && extensionsSupported && supportedFeatures.samplerAnisotropy;`
	`1447`	`+ return indices.isComplete() && extensionsSupported && swapChainAdequate && supportedFeatures.samplerAnisotropy;`
`1448`	`1448`	`}`
`1449`	`1449`
`1450`	`1450`	`bool checkDeviceExtensionSupport(VkPhysicalDevice device) {`
Original file line number	Diff line number	Diff line change
`@@ -1270,7 +1270,7 @@ class HelloTriangleApplication {`
`1270`	`1270`	`VkPhysicalDeviceFeatures supportedFeatures;`
`1271`	`1271`	`vkGetPhysicalDeviceFeatures(device, &supportedFeatures);`
`1272`	`1272`
`1273`		`- return indices.isComplete() && extensionsSupported && supportedFeatures.samplerAnisotropy;`
	`1273`	`+ return indices.isComplete() && extensionsSupported && swapChainAdequate && supportedFeatures.samplerAnisotropy;`
`1274`	`1274`	`}`
`1275`	`1275`
`1276`	`1276`	`bool checkDeviceExtensionSupport(VkPhysicalDevice device) {`
Original file line number	Diff line number	Diff line change
`@@ -1300,7 +1300,7 @@ class HelloTriangleApplication {`
`1300`	`1300`	`VkPhysicalDeviceFeatures supportedFeatures;`
`1301`	`1301`	`vkGetPhysicalDeviceFeatures(device, &supportedFeatures);`
`1302`	`1302`
`1303`		`- return indices.isComplete() && extensionsSupported && supportedFeatures.samplerAnisotropy;`
	`1303`	`+ return indices.isComplete() && extensionsSupported && swapChainAdequate && supportedFeatures.samplerAnisotropy;`
`1304`	`1304`	`}`
`1305`	`1305`
`1306`	`1306`	`bool checkDeviceExtensionSupport(VkPhysicalDevice device) {`