Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 15 Nov 2018 15:16:35 +0000 (16:16 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 15 Nov 2018 15:16:35 +0000 (16:16 +0100)
commit1f16ca7fa02ea8646fb7f7a28d97b70d625dd221
tree503e64181eb751c7c0bc29ea5e6c9cff9f43e0dc
parent71e336126ac2959418f9c39a9507e91e4dc61951
parentcd3bb68f8501cb96a4f92136c430f9fd23c0ec56
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I285b9ae9fc013999961c6b8c40f7eb8a661a5609
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.hpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.3/vk-default.txt