Refactor X11 and wayland platforms to run alongside each other

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

diff --git a/framework/platform/X11/tcuX11EglPlatform.cpp b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp
similarity index 96%
rename from framework/platform/X11/tcuX11EglPlatform.cpp
rename to framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp
index ca90bc3..074dbb1 100644 (file)
--- a/framework/platform/X11/tcuX11EglPlatform.cpp
+++ b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp
@@ -18,17 +18,21 @@
  *
  *//*!
  * \file
- * \brief X11Egl Platform.
+ * \brief X11Egl Display Factory.
  *//*--------------------------------------------------------------------*/
 
-#include "tcuX11EglPlatform.hpp"
+#include "tcuLnxX11EglDisplayFactory.hpp"
+#include "tcuLnxX11.hpp"
 #include "egluGLContextFactory.hpp"
 #include "eglwLibrary.hpp"
 #include "eglwFunctions.hpp"
 #include "eglwEnums.hpp"
+#include "deUniquePtr.hpp"
 
 namespace tcu
 {
+namespace lnx
+{
 namespace x11
 {
 namespace egl
@@ -286,17 +290,12 @@ NativeDisplay* DisplayFactory::createDisplay (const eglw::EGLAttrib* attribList)
        return new Display(x11Display);
 }
 
-Platform::Platform (EventState& eventState)
+NativeDisplayFactory* createDisplayFactory (EventState& eventState)
 {
-       m_nativeDisplayFactoryRegistry.registerFactory(new DisplayFactory(eventState));
+       return new DisplayFactory(eventState);
 }
 
-MovePtr<ContextFactory> Platform::createContextFactory (void)
-{
-       return MovePtr<ContextFactory>(new GLContextFactory(m_nativeDisplayFactoryRegistry));
-}
-
-
 } // egl
 } // x11
+} // lnx
 } // tcu