Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Mon, 15 Jul 2019 11:34:07 +0000 (13:34 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Mon, 15 Jul 2019 11:34:07 +0000 (13:34 +0200)
commitd7e1c4089345be0cd0abd324e02893073148f106
tree49987f7f0e20b20ff9e4341b58ea953ff195fb74
parent0ad2ab57b784afc465711567696ced4664a52ddb
parentd1b3034b4543535d4496801f5fc22ea74ef632eb
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

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