From 8bd4b9d2f90ca62de609be3dd07564f70edc44ad Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Tue, 5 Aug 2014 20:33:50 -0400
Subject: Remove support for Wayland

Yes, this is a fancy new feature, but our Wayland support was
particularly bitrotten, and ideally this would be handled by a platform
layer like SDL. If not, we can always add this back in when GLInterface
has caught up. We might be able to even support wxWidgets and GL
together with subsurfaces!
---
 Source/Core/DolphinWX/MainNoGUI.cpp | 47 ++-----------------------------------
 1 file changed, 2 insertions(+), 45 deletions(-)

(limited to 'Source/Core/DolphinWX/MainNoGUI.cpp')

diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp
index 9befeb4b59..0b9e2f783b 100644
--- a/Source/Core/DolphinWX/MainNoGUI.cpp
+++ b/Source/Core/DolphinWX/MainNoGUI.cpp
@@ -29,10 +29,6 @@
 #include "DolphinWX/X11Utils.h"
 #endif
 
-#if HAVE_WAYLAND
-#include <wayland-client.h>
-#endif
-
 #ifdef USE_EGL
 #include "DolphinWX/GLInterface/GLInterface.h"
 #endif
@@ -262,23 +258,6 @@ static void X11_MainLoop()
 }
 #endif
 
-#if HAVE_WAYLAND
-static void Wayland_MainLoop()
-{
-	// Wait for display to be initialized
-	while (!GLWin.wl_display)
-		usleep(20000);
-
-	GLWin.running = 1;
-
-	while (GLWin.running)
-		wl_display_dispatch(GLWin.wl_display);
-
-	if (GLWin.wl_display)
-		wl_display_disconnect(GLWin.wl_display);
-}
-#endif
-
 int main(int argc, char* argv[])
 {
 #ifdef __APPLE__
@@ -330,34 +309,12 @@ int main(int argc, char* argv[])
 		m_LocalCoreStartupParameter.m_strVideoBackend);
 	WiimoteReal::LoadSettings();
 
-#if USE_EGL
-	GLWin.platform = EGL_PLATFORM_NONE;
-#endif
-#if HAVE_WAYLAND
-	GLWin.wl_display = nullptr;
-#endif
-
 	// No use running the loop when booting fails
 	if (BootManager::BootCore(argv[optind]))
 	{
-#if USE_EGL
-		while (GLWin.platform == EGL_PLATFORM_NONE)
-			usleep(20000);
-#endif
-#if HAVE_WAYLAND
-		if (GLWin.platform == EGL_PLATFORM_WAYLAND)
-			Wayland_MainLoop();
-#endif
 #if HAVE_X11
-#if USE_EGL
-		if (GLWin.platform == EGL_PLATFORM_X11)
-		{
-#endif
-			XInitThreads();
-			X11_MainLoop();
-#if USE_EGL
-		}
-#endif
+		XInitThreads();
+		X11_MainLoop();
 #endif
 #ifdef __APPLE__
 		while (running)
-- 
cgit v1.2.3