Merge gerrit/vulkan-cts-1.0-dev into gerrit/opengl-cts-dev
authorPyry Haulos <phaulos@google.com>
Fri, 2 Dec 2016 19:45:59 +0000 (11:45 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 2 Dec 2016 19:45:59 +0000 (11:45 -0800)
Change-Id: I3228680996ef34bbc824b4e38d26da0597ff22b7

1  2 
external/vulkancts/modules/vulkan/pipeline/CMakeLists.txt
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp