Merge vulkancts/vulkan-cts-1.0-dev into vulkancts/opengl-cts-dev
authorPyry Haulos <phaulos@google.com>
Tue, 24 Jan 2017 00:32:35 +0000 (16:32 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 24 Jan 2017 00:32:35 +0000 (16:32 -0800)
commitc9921995d8d360bd34d8672194d7c095bb376f82
treee030bada0bb1b480abc1bbb5cd356fdf08dccc0d
parent2fbb73bf9dc35bd1d650a5e86930a894086c8849
parentbf6ca6364f9b1b90ec02582990e1a1c9646a1624
Merge vulkancts/vulkan-cts-1.0-dev into vulkancts/opengl-cts-dev

Change-Id: Iad6867155d0e94a63b4dfd259f17a811baab5520
Android.mk
external/vulkancts/modules/vulkan/draw/CMakeLists.txt
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp