Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Mon, 20 May 2019 13:14:32 +0000 (15:14 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Mon, 20 May 2019 13:14:32 +0000 (15:14 +0200)
commite1d743e8742b4a295fe49bca7f57730f612dad86
treeae9e826d4b6d6235e9bf0e449ec7210d02248ab6
parentb20c2824cd8c0fe8e6bffd70cb65062f91accee3
parent35bc9941ef71a6b38f7f391f1382a655d3cb66a6
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Ic2d49ddfd66cdfcaa19bdc52f2eeb6bafd305086
16 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/vkPrograms.cpp
external/vulkancts/framework/vulkan/vkSpirVAsm.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/spirv_assembly/vktSpvAsmInstructionTests.cpp
external/vulkancts/modules/vulkan/vktTestCase.cpp
external/vulkancts/modules/vulkan/vktTestCase.hpp
external/vulkancts/mustpass/master/vk-default-no-waivers.txt
external/vulkancts/mustpass/master/vk-default.txt
external/vulkancts/scripts/src/vulkan.h.in