Merge vulkancts/vulkan-cts-1.0-dev into vulkancts/opengl-cts-dev
authorPyry Haulos <phaulos@google.com>
Thu, 19 Jan 2017 19:43:08 +0000 (11:43 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 19 Jan 2017 19:43:08 +0000 (11:43 -0800)
Change-Id: I54cbd7d0021d911bad32411f54437fb270a60b64

1  2 
external/vulkancts/modules/vulkan/pipeline/CMakeLists.txt
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
modules/gles31/functional/es31fStencilTexturingTests.cpp
modules/gles31/functional/es31fTextureFilteringTests.cpp