Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Tue, 18 Dec 2018 11:58:47 +0000 (12:58 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Tue, 18 Dec 2018 12:50:10 +0000 (13:50 +0100)
commit479782dd2f47631fd9882c7b1ca51620c6df76c8
treef8f14be374c5a507cb816e40d3d9b9a3cef4d59a
parent9e87fad1b212f8f308f1ff320405d5d357c1feff
parent7d0dc06e19cb17f81fc97c3375cfee232585b455
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Ib44f63dc9bbc3da62777baea5bbf22b19151aec8
AndroidGen.mk
android/cts/master/vk-master.txt
external/vulkancts/framework/vulkan/vkBasicTypes.inl
external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
external/vulkancts/framework/vulkan/vkVulkan_c.inl
external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
external/vulkancts/mustpass/1.1.3/src/excluded-tests.txt
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