Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 2 Aug 2018 11:59:46 +0000 (13:59 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 2 Aug 2018 13:21:10 +0000 (15:21 +0200)
commit78141560effafa350628e47ceb83e0a9db43d1ef
treea2223025b79cb7aec6629cd4ecefc93c9cc6918c
parent3ef3fe8a93896f1c75ca6a07672276385f4cdd21
parent6d7ec88c13b3abf3741eace2d0eb757b17922228
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Ibee86ab6339aefce94bd27190d57cf1c5552bd29
AndroidGen.mk
android/cts/master/vk-master.txt
external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.3/vk-default.txt