Merge upstream-vulkan-cts-1.0-dev into master
authorPyry Haulos <phaulos@google.com>
Tue, 9 Aug 2016 20:02:10 +0000 (13:02 -0700)
committerPyry Haulos <phaulos@google.com>
Tue, 9 Aug 2016 20:03:01 +0000 (13:03 -0700)
commitfb20fc5f5d186c5cb1453a225ac68607d5e54b7b
tree789f9ce88bf942485175344aaffee5c61078f4f9
parent5fe6837872a68e25a9e18ff9058ae96dcc545cc7
parentf50ff8642e855301a7c836c4f1046bee6977face
Merge upstream-vulkan-cts-1.0-dev into master

Change-Id: I318218fecd46ac39cc8dd5904d6fae3658bdb771
android/cts/master/com.drawelements.deqp.vk.xml
android/cts/master/vk-master.txt
external/vulkancts/framework/vulkan/vkNullDriver.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp