Merge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Tue, 17 Dec 2019 16:42:08 +0000 (17:42 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Tue, 17 Dec 2019 16:42:08 +0000 (17:42 +0100)
commitdd5da5bee0a86898ab161b76266c360d68aef836
tree016745f08b9ff6016b88bf52f22e2bf80ff7110e
parentd8ed69fbbba7f535e126fb0f4b4675d1120a8c6a
parent5b2e2b6f59e5f32f820b230949aba960a84849c5
Merge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/master

Change-Id: I1480366fa7076b474ea7d3da34a1375c09b9da0c
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp
framework/common/tcuTextureUtil.cpp