Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Mon, 28 Oct 2019 09:38:20 +0000 (10:38 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Mon, 28 Oct 2019 09:38:20 +0000 (10:38 +0100)
commitaf3545a91785a9db90f4816ce395250141e84552
treef4df5f3a824b2b0b1b06165a1d1f54afa970dcb0
parente38135c4aa2946262fccd581f674c41973fde906
parentcccc781da04be623232b3fc41a247b0bd8a2463e
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I0cd293e2cb716e77870aa6b43d86125050ff1482
AndroidGen.mk
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/image/vktImageTranscodingSupportTests.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp
external/vulkancts/modules/vulkan/vktCustomInstancesDevices.cpp
external/vulkancts/mustpass/master/vk-default-no-waivers.txt
external/vulkancts/mustpass/master/vk-default.txt