Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Mon, 22 May 2017 19:34:20 +0000 (12:34 -0700)
committerPyry Haulos <phaulos@google.com>
Mon, 22 May 2017 19:34:20 +0000 (12:34 -0700)
commit02b12f8dad7c2f7f3884e2ed0de02b8a15a68de5
tree25ca1e6927be47bf618be87feed9f927a43b134c
parent6383bc6dd4a60bc0e91ce876cbf9f064c553ff75
parentb9dd117ad3e52b929c4ee7c3e5d20442ab42b274
Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master

Change-Id: Ie841d0a435d1d587450b7c2d57307b37b3295bbb
framework/platform/lnx/X11/tcuLnxX11.cpp
framework/platform/lnx/X11/tcuLnxX11.hpp
framework/platform/lnx/X11/tcuLnxX11GlxPlatform.cpp
framework/platform/lnx/tcuLnxPlatform.cpp
targets/default/default.cmake