Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Tue, 19 Mar 2019 19:24:19 +0000 (20:24 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Tue, 19 Mar 2019 19:24:19 +0000 (20:24 +0100)
commitb6d78c95e8aa6ed2e039671eed9b120185adbd61
treece5fe74f6feb20132a65f9e1ed58197e147c2b1d
parent656826a55cb17850a0f33dacf671490715020efa
parent06c2fa9db879e0fadabc5efff50157c23bd4be31
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Ife5f839f2e09277d3b81dd4e8f47d70ab7387274
14 files changed:
AndroidGen.mk
android/cts/master/vk-master.txt
external/fetch_sources.py
external/vulkancts/framework/vulkan/vkBasicTypes.inl
external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl
external/vulkancts/framework/vulkan/vkStrUtil.inl
external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
external/vulkancts/framework/vulkan/vkStructTypes.inl
external/vulkancts/framework/vulkan/vkVulkan_c.inl
external/vulkancts/modules/vulkan/vktTestCase.cpp
external/vulkancts/modules/vulkan/vktTestCase.hpp
external/vulkancts/mustpass/1.1.4/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.4/vk-default.txt
external/vulkancts/scripts/src/vulkan.h.in