Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 21 Feb 2019 10:57:50 +0000 (11:57 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 21 Feb 2019 10:57:50 +0000 (11:57 +0100)
commit9e86c7d020cfc2514301adbeecf8ef88888af29b
tree0143692294890e2956299fb929bf9f094507fe4a
parent7a6aa926b20eacc755692795325e2d83358c28f5
parent65ebf85d4b32fc62201aedbef5b69d7c00298bee
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Ie80acb0a7654405befd612b55e383dfe9b0960bc
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemWsiSwapchainTests.cpp
external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp
external/vulkancts/mustpass/1.1.4/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.4/vk-default.txt