Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Tue, 19 Jan 2021 10:36:01 +0000 (11:36 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Tue, 19 Jan 2021 10:36:01 +0000 (11:36 +0100)
commitdfd57d53a83f4352f54d86644b1891f987333644
tree3b3b910d5d240605816c669401e5c6be841820df
parentb79a806329c91d7520154ea0ccf3f36e8d067b6e
parent12e5490eecdea6a890ac15e5b6065bd1c45070a8
Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/master

Change-Id: I262a7230e9bcfec6c8f45de81703a622b20586a1
AndroidGen.mk
android/cts/master/vk-master-2020-03-01.txt
android/cts/master/vk-master.txt
external/vulkancts/framework/vulkan/vkImageUtil.cpp
external/vulkancts/modules/vulkan/fragment_shader_interlock/vktFragmentShaderInterlockBasic.cpp
external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp
external/vulkancts/mustpass/master/vk-default.txt