Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 31 May 2019 15:54:52 +0000 (17:54 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 31 May 2019 15:54:52 +0000 (17:54 +0200)
commit9967764e0e391f0dab494f64ae579aa376a4d85a
tree4f59e3889307a2bc2fd2efbeb1d9f0f33fc5ca98
parent577b36b7e6e26ca9b69a8ba4eb1b72772fd074d4
parent49cb864896d7d534b4e69d28380265548d202415
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I7c3689ad0332e512c49306fb0ebcf544bd409e58
android/cts/master/vk-master.txt
external/vulkancts/framework/vulkan/vkVulkan_c.inl
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/mustpass/master/vk-default-no-waivers.txt
external/vulkancts/mustpass/master/vk-default.txt
external/vulkancts/scripts/src/vulkan.h.in