Merge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/vulkan-cts-1.2.1
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 4 Jun 2020 07:48:50 +0000 (09:48 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 4 Jun 2020 07:48:50 +0000 (09:48 +0200)
Change-Id: I888b86ca0ad11da7329e4aace426274c44439d9e

1  2 
external/vulkancts/modules/vulkan/clipping/vktClippingTests.cpp
modules/egl/teglWideColorTests.cpp

Simple merge