Merge "Add scissoring tests" into vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Thu, 8 Sep 2016 18:20:37 +0000 (14:20 -0400)
committerGerrit Code Review <gerrit@gerrit.khronos.org>
Thu, 8 Sep 2016 18:20:37 +0000 (14:20 -0400)
1  2 
android/cts/master/com.drawelements.deqp.vk.xml
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/CMakeLists.txt
external/vulkancts/modules/vulkan/vktTestPackage.cpp
external/vulkancts/mustpass/1.0.1/vk-default.txt

Simple merge