From c9836ff59292855093ba5f7bdc47755ea74123a5 Mon Sep 17 00:00:00 2001
From: Scott Mansell <phiren@gmail.com>
Date: Sat, 19 Sep 2015 06:12:20 +1200
Subject: [PATCH] EGL: Don't depend on VideoCommon or Core

---
 Source/Core/Common/GL/GLInterface/EGL.cpp        | 6 +-----
 Source/Core/Common/GL/GLInterface/EGL.h          | 1 -
 Source/Core/Common/GL/GLInterface/EGLAndroid.cpp | 1 -
 Source/Core/VideoBackends/OGL/Render.cpp         | 6 ++++--
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Source/Core/Common/GL/GLInterface/EGL.cpp b/Source/Core/Common/GL/GLInterface/EGL.cpp
index c094b9eae5..92f778eb66 100644
--- a/Source/Core/Common/GL/GLInterface/EGL.cpp
+++ b/Source/Core/Common/GL/GLInterface/EGL.cpp
@@ -2,10 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Common/GL/GLInterfaceBase.h"
 #include "Common/GL/GLInterface/EGL.h"
-#include "VideoCommon/DriverDetails.h"
-#include "VideoCommon/RenderBase.h"
 
 // Show the current FPS
 void cInterfaceEGL::Swap()
@@ -14,8 +11,7 @@ void cInterfaceEGL::Swap()
 }
 void cInterfaceEGL::SwapInterval(int Interval)
 {
-	if (!DriverDetails::HasBug(DriverDetails::BUG_BROKENVSYNC))
-		eglSwapInterval(egl_dpy, Interval);
+	eglSwapInterval(egl_dpy, Interval);
 }
 
 void* cInterfaceEGL::GetFuncAddress(const std::string& name)
diff --git a/Source/Core/Common/GL/GLInterface/EGL.h b/Source/Core/Common/GL/GLInterface/EGL.h
index 02a962d613..f25b129d90 100644
--- a/Source/Core/Common/GL/GLInterface/EGL.h
+++ b/Source/Core/Common/GL/GLInterface/EGL.h
@@ -8,7 +8,6 @@
 #include <EGL/egl.h>
 
 #include "Common/GL/GLInterfaceBase.h"
-#include "Core/ConfigManager.h"
 
 class cInterfaceEGL : public cInterfaceBase
 {
diff --git a/Source/Core/Common/GL/GLInterface/EGLAndroid.cpp b/Source/Core/Common/GL/GLInterface/EGLAndroid.cpp
index 023ba9b901..c2204d3ec7 100644
--- a/Source/Core/Common/GL/GLInterface/EGLAndroid.cpp
+++ b/Source/Core/Common/GL/GLInterface/EGLAndroid.cpp
@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include "Common/GL/GLInterface/EGLAndroid.h"
-#include "Core/Host.h"
 
 EGLDisplay cInterfaceEGLAndroid::OpenDisplay()
 {
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp
index 4e094f0d2c..6481480a3b 100644
--- a/Source/Core/VideoBackends/OGL/Render.cpp
+++ b/Source/Core/VideoBackends/OGL/Render.cpp
@@ -639,7 +639,8 @@ Renderer::Renderer()
 
 	// Handle VSync on/off
 	s_vsync = g_ActiveConfig.IsVSync();
-	GLInterface->SwapInterval(s_vsync);
+	if (!DriverDetails::HasBug(DriverDetails::BUG_BROKENVSYNC))
+		GLInterface->SwapInterval(s_vsync);
 
 	// TODO: Move these somewhere else?
 	FramebufferManagerBase::SetLastXfbWidth(MAX_XFB_WIDTH);
@@ -1730,7 +1731,8 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, co
 	if (s_vsync != g_ActiveConfig.IsVSync())
 	{
 		s_vsync = g_ActiveConfig.IsVSync();
-		GLInterface->SwapInterval(s_vsync);
+		if (!DriverDetails::HasBug(DriverDetails::BUG_BROKENVSYNC))
+			GLInterface->SwapInterval(s_vsync);
 	}
 
 	// Clean out old stuff from caches. It's not worth it to clean out the shader caches.