Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Tue, 6 Nov 2018 15:20:18 +0000 (16:20 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Tue, 6 Nov 2018 15:20:18 +0000 (16:20 +0100)
commit32109002d16d1935fbebb6dc4bdbbcf83b6af23d
treeb3fee0dcfe4f386f51553da8266ea1d5039c6f0b
parent8dbff9d866aa838047c641a5eeab19381be3df4f
parentba37aabad14a3a5832be30fbd2bf82141cd4db0f
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I5c227fb62141046cb6d2a8f1956b2c4a60d67abb
15 files changed:
AndroidGen.mk
android/cts/master/vk-master.txt
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/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/modules/vulkan/renderpass/CMakeLists.txt
external/vulkancts/modules/vulkan/spirv_assembly/CMakeLists.txt
external/vulkancts/modules/vulkan/vktTestCase.cpp
external/vulkancts/modules/vulkan/vktTestCase.hpp
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