Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 12 Oct 2018 11:05:16 +0000 (13:05 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 12 Oct 2018 12:22:03 +0000 (14:22 +0200)
commit61957102e37911e111b9d06cb784f9a66537ef22
treef05f0b7a8790776df29e928726eee41983f6d205
parentf436d65bc0b890d57671bc601ff1f20127c5ea17
parentf0f48eedf08ac4179196a25276f363df29b530ce
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I873830d45bead5c66669f74be5f08fcaa871c73a
AndroidGen.mk
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/vktSpvAsmInstructionTests.cpp
external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.3/vk-default.txt