From cfb3d4ff3f7bf18b57994c6154a92e7e794f13b0 Mon Sep 17 00:00:00 2001 From: David Sodman Date: Sun, 10 Jan 2016 22:54:48 -0800 Subject: [PATCH] Reverse sense of checking for unsupported features when determining limits. Fixes #174 Change-Id: Ic36127c5d9ab9512d1995f5898a14b8ba344d43f --- external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp index a9363e4..f618893 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp @@ -275,7 +275,7 @@ bool validateFeatureLimits(VkPhysicalDeviceProperties* properties, VkPhysicalDev deUint32 limitToCheck = featureLimitTable[ndx].uintVal; if (featureLimitTable[ndx].unsuppTableNdx != -1) { - if (*((VkBool32*)((char*)features+unsupportedFeatureTable[featureLimitTable[ndx].unsuppTableNdx].featureOffset))) + if (*((VkBool32*)((char*)features+unsupportedFeatureTable[featureLimitTable[ndx].unsuppTableNdx].featureOffset)) == VK_FALSE) limitToCheck = unsupportedFeatureTable[featureLimitTable[ndx].unsuppTableNdx].uintVal; } @@ -308,7 +308,7 @@ bool validateFeatureLimits(VkPhysicalDeviceProperties* properties, VkPhysicalDev float limitToCheck = featureLimitTable[ndx].floatVal; if (featureLimitTable[ndx].unsuppTableNdx != -1) { - if (*((VkBool32*)((char*)features+unsupportedFeatureTable[featureLimitTable[ndx].unsuppTableNdx].featureOffset))) + if (*((VkBool32*)((char*)features+unsupportedFeatureTable[featureLimitTable[ndx].unsuppTableNdx].featureOffset)) == VK_FALSE) limitToCheck = unsupportedFeatureTable[featureLimitTable[ndx].unsuppTableNdx].floatVal; } @@ -340,7 +340,7 @@ bool validateFeatureLimits(VkPhysicalDeviceProperties* properties, VkPhysicalDev deInt32 limitToCheck = featureLimitTable[ndx].intVal; if (featureLimitTable[ndx].unsuppTableNdx != -1) { - if (*((VkBool32*)((char*)features+unsupportedFeatureTable[featureLimitTable[ndx].unsuppTableNdx].featureOffset))) + if (*((VkBool32*)((char*)features+unsupportedFeatureTable[featureLimitTable[ndx].unsuppTableNdx].featureOffset)) == VK_FALSE) limitToCheck = unsupportedFeatureTable[featureLimitTable[ndx].unsuppTableNdx].intVal; } if (featureLimitTable[ndx].type == LIMIT_TYPE_MIN) @@ -371,7 +371,7 @@ bool validateFeatureLimits(VkPhysicalDeviceProperties* properties, VkPhysicalDev deUint64 limitToCheck = featureLimitTable[ndx].deviceSizeVal; if (featureLimitTable[ndx].unsuppTableNdx != -1) { - if (*((VkBool32*)((char*)features+unsupportedFeatureTable[featureLimitTable[ndx].unsuppTableNdx].featureOffset))) + if (*((VkBool32*)((char*)features+unsupportedFeatureTable[featureLimitTable[ndx].unsuppTableNdx].featureOffset)) == VK_FALSE) limitToCheck = unsupportedFeatureTable[featureLimitTable[ndx].unsuppTableNdx].deviceSizeVal; } -- 2.7.4