Fix unsupported_features test.

The unsupported_features test will always fail when
EXT_pageable_device_local_memory is supported.

This change moves the code that disables pageableDeviceLocalMemory
into if(!enableAllFeatures) where it will function as expected.

Components: Vulkan
Affects: dEQP-VK.api.device_init.create_device_unsupported_features

VK-GL-CTS issue: 3543

Change-Id: If646473de3a3da743d706acbe5fcd2bd39973f1e

diff --git a/external/vulkancts/framework/vulkan/vkDeviceFeatures.cpp b/external/vulkancts/framework/vulkan/vkDeviceFeatures.cpp
index bac8958b6eaccaf949a828c42c369252a7c9d576..16cbe28e8eaf08cbe2c5df00e538c387f9743a7c 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkDeviceFeatures.cpp
+++ b/external/vulkancts/framework/vulkan/vkDeviceFeatures.cpp
@@ -163,13 +163,13 @@ DeviceFeatures::DeviceFeatures    (const InstanceInterface&                       vki,
                        if (fragmentDensityMapFeatures)
                                fragmentDensityMapFeatures->fragmentDensityMap = false;
                }
-       }
 
-       // Disable pageableDeviceLocalMemory by default since it may modify the behavior
-       // of device-local, and even host-local, memory allocations for all tests.
-       // pageableDeviceLocalMemory will use targetted testing on a custom device.
-       if (pageableDeviceLocalMemoryFeatures)
-               pageableDeviceLocalMemoryFeatures->pageableDeviceLocalMemory = false;
+               // Disable pageableDeviceLocalMemory by default since it may modify the behavior
+               // of device-local, and even host-local, memory allocations for all tests.
+               // pageableDeviceLocalMemory will use targetted testing on a custom device.
+               if (pageableDeviceLocalMemoryFeatures)
+                       pageableDeviceLocalMemoryFeatures->pageableDeviceLocalMemory = false;
+       }
 }
 
 bool DeviceFeatures::verifyFeatureAddCriteria (const FeatureStructCreationData& item, const std::vector<VkExtensionProperties>& properties)