From 74b82bab3b6e4e8a1799bbcbdc5244f20f4d2826 Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Wed, 3 Oct 2018 22:28:38 +1000
Subject: GLInterface: Drop Haiku support

---
 Source/Core/Common/GL/GLInterface/GLInterface.cpp | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'Source/Core/Common/GL/GLInterface/GLInterface.cpp')

diff --git a/Source/Core/Common/GL/GLInterface/GLInterface.cpp b/Source/Core/Common/GL/GLInterface/GLInterface.cpp
index edd84cc2ab..a6ae0c0991 100644
--- a/Source/Core/Common/GL/GLInterface/GLInterface.cpp
+++ b/Source/Core/Common/GL/GLInterface/GLInterface.cpp
@@ -20,9 +20,6 @@
 #include "Common/GL/GLInterface/EGL.h"
 #elif ANDROID
 #include "Common/GL/GLInterface/EGLAndroid.h"
-#elif defined(__HAIKU__)
-#include "Common/GL/GLInterface/BGL.h"
-#else
 #error Platform doesnt have a GLInterface
 #endif
 
@@ -42,8 +39,6 @@ std::unique_ptr<cInterfaceBase> HostGL_CreateGLInterface()
 #endif
 #elif ANDROID
   return std::make_unique<cInterfaceEGLAndroid>();
-#elif defined(__HAIKU__)
-  return std::make_unique<cInterfaceBGL>();
 #else
   return nullptr;
 #endif
-- 
cgit v1.2.3


From 134d967be2dd4ba9531abb8ba8494c3ac423ca72 Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Wed, 3 Oct 2018 23:02:45 +1000
Subject: Refactoring and cleanup of GLInterface (now GLContext)

---
 Source/Core/Common/GL/GLInterface/GLInterface.cpp | 45 -----------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 Source/Core/Common/GL/GLInterface/GLInterface.cpp

(limited to 'Source/Core/Common/GL/GLInterface/GLInterface.cpp')

diff --git a/Source/Core/Common/GL/GLInterface/GLInterface.cpp b/Source/Core/Common/GL/GLInterface/GLInterface.cpp
deleted file mode 100644
index a6ae0c0991..0000000000
--- a/Source/Core/Common/GL/GLInterface/GLInterface.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2014 Dolphin Emulator Project
-// Licensed under GPLv2+
-// Refer to the license.txt file included.
-
-#include <memory>
-
-#include "Common/GL/GLInterfaceBase.h"
-
-#if defined(__APPLE__)
-#include "Common/GL/GLInterface/AGL.h"
-#elif defined(_WIN32)
-#include "Common/GL/GLInterface/WGL.h"
-#elif HAVE_X11
-#if defined(USE_EGL) && USE_EGL
-#include "Common/GL/GLInterface/EGLX11.h"
-#else
-#include "Common/GL/GLInterface/GLX.h"
-#endif
-#elif defined(USE_EGL) && USE_EGL && defined(USE_HEADLESS)
-#include "Common/GL/GLInterface/EGL.h"
-#elif ANDROID
-#include "Common/GL/GLInterface/EGLAndroid.h"
-#error Platform doesnt have a GLInterface
-#endif
-
-std::unique_ptr<cInterfaceBase> HostGL_CreateGLInterface()
-{
-#if defined(__APPLE__)
-  return std::make_unique<cInterfaceAGL>();
-#elif defined(_WIN32)
-  return std::make_unique<cInterfaceWGL>();
-#elif defined(USE_EGL) && defined(USE_HEADLESS)
-  return std::make_unique<cInterfaceEGL>();
-#elif defined(HAVE_X11) && HAVE_X11
-#if defined(USE_EGL) && USE_EGL
-  return std::make_unique<cInterfaceEGLX11>();
-#else
-  return std::make_unique<cInterfaceGLX>();
-#endif
-#elif ANDROID
-  return std::make_unique<cInterfaceEGLAndroid>();
-#else
-  return nullptr;
-#endif
-}
-- 
cgit v1.2.3