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)
commite65883ae178bbe97ab47bc70daac82e61cef9546
treeb696dbdbc74d3e65c3f1c32899d4aa66a7c6df90
parent4eac0531b06060d1d5de6b4d31ee863d85ec447d
parent7e26f6844c65b09bd7e77d9e7c6cbd70661acb95
Merge vulkancts/vulkan-cts-1.0-dev into vulkancts/opengl-cts-dev

Change-Id: I54cbd7d0021d911bad32411f54437fb270a60b64
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