Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Wed, 4 Dec 2019 09:42:50 +0000 (10:42 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Wed, 4 Dec 2019 13:45:53 +0000 (14:45 +0100)
commitf328a373ed26e94c690b9f4721d343b8f38e04ce
tree24153095a58f4192e530d1fbf52b6cd1242c8e09
parent96f128d1cbfd93a5e5f86ff317c2deda40a4dde0
parent0072002147400cb5b0274fac37740c5d3175c01c
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I3696dd5668797086ee86d5c872bc2fb92c9366e9
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp
external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTestsUtils.cpp
external/vulkancts/mustpass/master/vk-default-no-waivers.txt
external/vulkancts/mustpass/master/vk-default.txt