Merge vk-gl-cts/github-master into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Tue, 6 Nov 2018 12:12:37 +0000 (13:12 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Tue, 6 Nov 2018 12:12:37 +0000 (13:12 +0100)
commita3497ff0651923834c630baacbf7343484da9bf5
treea9e35b4f98cce12db1b3bba54b8c37110f60bc38
parent90b601fa8d5c6ca10aca7b3ebb50c02400cb0049
parent54e546a1a0a6fa412ea4c3e3081bbc9518928a6e
Merge vk-gl-cts/github-master into vk-gl-cts/master

Change-Id: I6e7da6cfd1fe7d69bccf4231f4b04d9d3fdbd30b
AndroidGen.mk
android/cts/master/vk-master.txt
external/vulkancts/framework/vulkan/vkBasicTypes.inl
external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
external/vulkancts/modules/vulkan/CMakeLists.txt
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.3/vk-default.txt
external/vulkancts/scripts/src/vulkan.h.in