Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Mon, 28 Oct 2019 10:41:57 +0000 (11:41 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Mon, 28 Oct 2019 10:41:57 +0000 (11:41 +0100)
commit2ac6db157a37ab1f836865b80698a8a4302b6e17
treeb8fa8ba2e5e8108d62a90d79a78d82256a3e5cd1
parentaf3545a91785a9db90f4816ce395250141e84552
parent2a1f76ede0167750b6310bb8c7df43823c8668c2
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I36779b517d338b55ea3adab1d377711b21f90d90
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/pipeline/vktPipelineRenderToImageTests.cpp
external/vulkancts/mustpass/master/vk-default-no-waivers.txt
external/vulkancts/mustpass/master/vk-default.txt