Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 22 Nov 2019 18:10:09 +0000 (19:10 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 22 Nov 2019 18:10:09 +0000 (19:10 +0100)
commit0797409df5d21291ae28b34d5f84653388eb34a1
treeaa4f45400475c7f641d872a0ef23f963c9d9220a
parente266fee80d1ef3efcc3faefd6c9a320a1eb8ee26
parentb508809a27a3209906c37236263601181f906816
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I36544847548d95fed2b094f00e7604f64790bdb0
AndroidGen.mk
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/pipeline/CMakeLists.txt
external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp
external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.hpp
external/vulkancts/modules/vulkan/vktTestCase.cpp
external/vulkancts/mustpass/master/vk-default-no-waivers.txt
external/vulkancts/mustpass/master/vk-default.txt