Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Fri, 31 Mar 2017 15:58:48 +0000 (08:58 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 31 Mar 2017 16:10:21 +0000 (09:10 -0700)
commit0ec525c9bb7e925734e64bc7ddd50fe07337449d
treef2ddf14fdf2727a17113ddd77d48a80ee3af570f
parentd1a13c19f6e9b5120d40848fb289d2e47f2b8ca9
parent93e2af037c07511c2ac415ec3e55452d9cfc341d
Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master

Change-Id: I84b32ac597bf6c24cfb1d6528ccdb4fb10030290
AndroidGen.mk
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/wsi/CMakeLists.txt
external/vulkancts/modules/vulkan/wsi/vktWsiIncrementalPresentTests.cpp
external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp
external/vulkancts/mustpass/1.0.2/src/master.txt
external/vulkancts/mustpass/1.0.2/vk-default.txt
external/vulkancts/mustpass/1.0.3/vk-default.txt