Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Mon, 3 Apr 2017 18:09:53 +0000 (11:09 -0700)
committerPyry Haulos <phaulos@google.com>
Mon, 3 Apr 2017 18:09:53 +0000 (11:09 -0700)
Change-Id: I862763ebe1531b6f701657c34083fa715a287678

1  2 
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinPrecisionTests.cpp
modules/egl/teglRenderCase.cpp
modules/gles2/functional/es2fIntegerStateQueryTests.cpp
modules/gles3/functional/es3fIntegerStateQueryTests.cpp
modules/gles31/functional/es31fFboTestUtil.cpp
modules/gles31/functional/es31fMultisampleTests.cpp
modules/gles31/functional/es31fProgramInterfaceQueryTests.cpp

Simple merge