Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 24 Aug 2018 11:30:25 +0000 (13:30 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 24 Aug 2018 11:30:25 +0000 (13:30 +0200)
commit20df000ef2ba8d5eeb8a85e3976dd5000ab9dec2
tree9a64181e649940138ff8bfe1b8ddf4bb1342f69b
parent59bf515b59826b642be67ca93feb569e907cb493
parent8328b0087bb5ffc12a4911ae6f6d22eae5a55541
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Id857ed995a1e8cbf7ef706095407eb84f5d1d34b
AndroidGen.mk
android/cts/master/vk-master.txt
external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
external/vulkancts/framework/vulkan/vkStructTypes.inl
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