Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Tue, 19 Nov 2019 08:13:29 +0000 (09:13 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Tue, 19 Nov 2019 08:13:29 +0000 (09:13 +0100)
commit58f2183bbc15bf243d69c5b3715fc84b36db965c
tree00ec329518811a34404267bef21c0942ca4850f9
parent6b83b0b070a5ceb7f64a213c95a6edaeda4a777f
parent99341d9d834e607161f0aac4d4d0edefe027e5e6
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Ic223266a4266d5c5116db7d87d5519f2209c1a4e
12 files changed:
AndroidGen.mk
android/cts/master/vk-master.txt
external/vulkancts/framework/vulkan/vkDeviceExtensions.inl
external/vulkancts/framework/vulkan/vkVulkan_c.inl
external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp
external/vulkancts/modules/vulkan/query_pool/vktQueryPoolPerformanceTests.cpp
external/vulkancts/mustpass/master/vk-default-no-waivers.txt
external/vulkancts/mustpass/master/vk-default.txt
external/vulkancts/scripts/src/extensions_data.txt
external/vulkancts/scripts/src/vulkan_core.h