From 67b0dd27c992513883911a503f111b93269b52f6 Mon Sep 17 00:00:00 2001 From: plapins Date: Sat, 2 Jul 2016 22:42:06 +0200 Subject: [PATCH] Fixed code responsible for checking minimal required device parameters (limits). --- Project/Common/VulkanCommon.cpp | 2 +- Project/Tutorial01/Tutorial01.cpp | 2 +- Project/Tutorial02/Tutorial02.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Project/Common/VulkanCommon.cpp b/Project/Common/VulkanCommon.cpp index 37229a3..cb85772 100644 --- a/Project/Common/VulkanCommon.cpp +++ b/Project/Common/VulkanCommon.cpp @@ -359,7 +359,7 @@ namespace ApiWithoutSecrets { uint32_t major_version = VK_VERSION_MAJOR( device_properties.apiVersion ); - if( (major_version < 1) && + if( (major_version < 1) || (device_properties.limits.maxImageDimension2D < 4096) ) { std::cout << "Physical device " << physical_device << " doesn't support required parameters!" << std::endl; return false; diff --git a/Project/Tutorial01/Tutorial01.cpp b/Project/Tutorial01/Tutorial01.cpp index ba82306..40532b9 100644 --- a/Project/Tutorial01/Tutorial01.cpp +++ b/Project/Tutorial01/Tutorial01.cpp @@ -210,7 +210,7 @@ namespace ApiWithoutSecrets { uint32_t minor_version = VK_VERSION_MINOR( device_properties.apiVersion ); uint32_t patch_version = VK_VERSION_PATCH( device_properties.apiVersion ); - if( (major_version < 1) && + if( (major_version < 1) || (device_properties.limits.maxImageDimension2D < 4096) ) { std::cout << "Physical device " << physical_device << " doesn't support required parameters!" << std::endl; return false; diff --git a/Project/Tutorial02/Tutorial02.cpp b/Project/Tutorial02/Tutorial02.cpp index cdefaec..a70655a 100644 --- a/Project/Tutorial02/Tutorial02.cpp +++ b/Project/Tutorial02/Tutorial02.cpp @@ -335,7 +335,7 @@ namespace ApiWithoutSecrets { uint32_t major_version = VK_VERSION_MAJOR( device_properties.apiVersion ); - if( (major_version < 1) && + if( (major_version < 1) || (device_properties.limits.maxImageDimension2D < 4096) ) { std::cout << "Physical device " << physical_device << " doesn't support required parameters!" << std::endl; return false;