Refactor X11 and wayland platforms to run alongside each other

[platform/upstream/VK-GL-CTS.git] / framework / platform / lnx / X11 / tcuLnxX11GlxPlatform.cpp

diff --git a/framework/platform/X11/tcuX11GlxPlatform.cpp b/framework/platform/lnx/X11/tcuLnxX11GlxPlatform.cpp
similarity index 99%
rename from framework/platform/X11/tcuX11GlxPlatform.cpp
rename to framework/platform/lnx/X11/tcuLnxX11GlxPlatform.cpp
index 3dc27b3..312e4cf 100644 (file)
--- a/framework/platform/X11/tcuX11GlxPlatform.cpp
+++ b/framework/platform/lnx/X11/tcuLnxX11GlxPlatform.cpp
@@ -21,8 +21,7 @@
  * \brief Platform that uses X11 via GLX.
  *//*--------------------------------------------------------------------*/
 
-#include "tcuX11GlxPlatform.hpp"
-#include "tcuX11Platform.hpp"
+#include "tcuLnxX11GlxPlatform.hpp"
 
 #include "tcuRenderTarget.hpp"
 #include "glwInitFunctions.hpp"
@@ -37,6 +36,8 @@
 
 namespace tcu
 {
+namespace lnx
+{
 namespace x11
 {
 namespace glx
@@ -185,7 +186,7 @@ private:
 
 extern "C"
 {
-       static int tcuX11GlxErrorHandler (::Display* display, XErrorEvent* event)
+       static int tcuLnxX11GlxErrorHandler (::Display* display, XErrorEvent* event)
        {
                char buf[80];
                XGetErrorText(display, event->error_code, buf, sizeof(buf));
@@ -204,7 +205,7 @@ GlxContextFactory::GlxContextFactory (EventState& eventState)
                                        reinterpret_cast<const GLubyte*>("glXCreateContextAttribsARB")))))
        , m_eventState                                  (eventState)
 {
-       XSetErrorHandler(tcuX11GlxErrorHandler);
+       XSetErrorHandler(tcuLnxX11GlxErrorHandler);
 }
 
 RenderContext* GlxContextFactory::createContext (const RenderConfig&   config,
@@ -682,4 +683,5 @@ MovePtr<ContextFactory> createContextFactory (EventState& eventState)
 
 } // glx
 } // x11
+} // lnx
 } // tcu