Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Mon, 10 Sep 2018 08:35:38 +0000 (10:35 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Mon, 10 Sep 2018 08:39:21 +0000 (10:39 +0200)
commit3c8dd86521a7f9af6f78b06dfa3f80cd5ff32907
tree4c6f75c30f3017720532063bda1ad07cdc51e298
parent7b67c6b50d9c2ab062d15a537ec902cbcd13da42
parent8bc75f5cf811df49d5cf8472ec39b49918488758
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Ifce84bc2e772e60ba1b3905bf3d5251cd2462833
AndroidGen.mk
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/api/CMakeLists.txt
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/modules/vulkan/api/vktApiTests.cpp
external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.3/vk-default.txt