Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I4a87a92e06be2feabe865af2cc1b64a85f11859d

diff --cc external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
index aba1c42,22d016a..300efed
--- 1/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
--- 2/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
@@@ -761,8 -760,8 +761,9 @@@ void checkDeviceExtensions (tcu::Result
                "VK_KHR_draw_indirect_count",
                "VK_KHR_create_renderpass2",
                "VK_KHR_driver_properties",
 +              "VK_KHR_swapchain_mutable_format",
                "VK_KHR_shader_atomic_int64",
+               "VK_KHR_vulkan_memory_model",
        };
  
        checkKhrExtensions(results, extensions, DE_LENGTH_OF_ARRAY(s_allowedDeviceKhrExtensions), s_allowedDeviceKhrExtensions);

diff --cc external/vulkancts/modules/vulkan/vktTestCase.cpp
index 87bb3e7,8e46513..19da80e
--- 1/external/vulkancts/modules/vulkan/vktTestCase.cpp
--- 2/external/vulkancts/modules/vulkan/vktTestCase.cpp
+++ b/external/vulkancts/modules/vulkan/vktTestCase.cpp
@@@ -439,8 -427,7 +439,8 @@@ public
        const VkPhysicalDevice8BitStorageFeaturesKHR&                   get8BitStorageFeatures                          (void) const    { return m_deviceFeatures.eightBitStorageFeatures;                      }
        const VkPhysicalDevice16BitStorageFeatures&                             get16BitStorageFeatures                         (void) const    { return m_deviceFeatures.sixteenBitStorageFeatures;            }
        const VkPhysicalDeviceVariablePointerFeatures&                  getVariablePointerFeatures                      (void) const    { return m_deviceFeatures.variablePointerFeatures;                      }
-       const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT&        getVertexAttributeDivisorFeatures       (void) const    { return m_deviceFeatures.vertexAttributeDivisorFeatures;       }
 +      const VkPhysicalDeviceFloat16Int8FeaturesKHR&                   getFloat16Int8Features                          (void) const    { return m_deviceFeatures.float16Int8Features;                          }
+       const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT&getVertexAttributeDivisorFeatures       (void) const    { return m_deviceFeatures.vertexAttributeDivisorFeatures;       }
        const VkPhysicalDeviceVulkanMemoryModelFeaturesKHR&             getVulkanMemoryModelFeatures            (void) const    { return m_deviceFeatures.vulkanMemoryModelFeatures;    }
        const VkPhysicalDeviceShaderAtomicInt64FeaturesKHR&             getShaderAtomicInt64Features            (void) const    { return m_deviceFeatures.shaderAtomicInt64Features;    }
        VkDevice                                                                                                getDevice                                                       (void) const    { return *m_device;                                                                                     }