Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 18 Jul 2019 08:10:49 +0000 (10:10 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 18 Jul 2019 08:10:49 +0000 (10:10 +0200)
commit8d6b99fbda10375a9b5b9e036bf644fd5fe4d9e4
tree41e3fe0c233aca45dfa6400b8310c9d5c36daebc
parentafaa59cc514a32efae4e2c77eaffb030421c6faf
parenta02aa0b3e6847471152dc95f5848c6ceeab84442
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I873458d7f08f034b849ce96cc95ad225ec17cf79
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp
external/vulkancts/modules/vulkan/subgroups/vktSubgroupsVoteTests.cpp
external/vulkancts/mustpass/master/vk-default-no-waivers.txt
external/vulkancts/mustpass/master/vk-default.txt