Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Wed, 18 Oct 2017 14:11:13 +0000 (16:11 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Wed, 18 Oct 2017 14:11:13 +0000 (16:11 +0200)
commit6543c3575b2e71f21aec566f0f72bc92b8b1f53f
treef4e4511ce856c9c8e1ede4403f042662656a7e66
parente71408c29fbd748a2d399f1bb8874ae73e0f352d
parentfb49c26b514b76e5df6b35049709d128ee15424c
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Icd24f4ebdc1ea669b153b9177032bf97aa0460fc
AndroidGen.mk
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/renderpass/vktRenderPassSampleReadTests.cpp
external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp
external/vulkancts/mustpass/1.1.0/src/waivers.txt
external/vulkancts/mustpass/1.1.0/vk-default.txt