Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 4 Apr 2019 09:13:52 +0000 (11:13 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 4 Apr 2019 10:40:04 +0000 (12:40 +0200)
commit35ba0495b9360eaba7779be419a31ea805507035
tree0d90c813de052cb963b448671bd9c5c81c88bc2c
parent46270b035ff38abc5f8828ba3c1095f786cbcf96
parent7871b6a8e263e1fddefbdbfbf1ca19e657f384ec
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I7120f08212d152dc035b0028c89c3cf683173370
18 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/vkPrograms.cpp
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/CMakeLists.txt
external/vulkancts/modules/vulkan/amber/vktAmberTestCase.cpp
external/vulkancts/modules/vulkan/vktTestCase.cpp
external/vulkancts/modules/vulkan/vktTestCase.hpp
external/vulkancts/modules/vulkan/vktTestPackage.cpp
external/vulkancts/mustpass/1.1.5/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.5/vk-default.txt
external/vulkancts/scripts/src/vulkan.h.in