Merge branch 'vulkan-cts-1.2.4' into vulkan-cts-1.2.5
authorPeter Kohaut <peter.kohaut@arm.com>
Fri, 3 Sep 2021 07:33:02 +0000 (09:33 +0200)
committerPeter Kohaut <peter.kohaut@arm.com>
Fri, 3 Sep 2021 08:20:15 +0000 (08:20 +0000)
Change-Id: I952af5b744206c52b4161d8c1102b6a8c2a53f58

1  2 
android/cts/master/src/vk-master-2019-03-01.txt
android/cts/master/vk-master-2019-03-01.txt
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp
external/vulkancts/mustpass/master/vk-default.txt

Simple merge