ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

EGL: Don't depend on VideoCommon or Core

This commit is contained in:
Scott Mansell 2015-09-19 06:12:20 +12:00
parent 72249b8085
commit c9836ff592
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Common/GL/GLInterface/EGL.cpp
View File

@ -2,10 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Common/GL/GLInterfaceBase.h"
#include "Common/GL/GLInterface/EGL.h" #include "Common/GL/GLInterface/EGL.h"
#include "VideoCommon/DriverDetails.h"
#include "VideoCommon/RenderBase.h"
// Show the current FPS // Show the current FPS
void cInterfaceEGL::Swap() void cInterfaceEGL::Swap()
@ -14,8 +11,7 @@ void cInterfaceEGL::Swap()
} }
void cInterfaceEGL::SwapInterval(int Interval) 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) void* cInterfaceEGL::GetFuncAddress(const std::string& name)

1
Source/Core/Common/GL/GLInterface/EGL.h
View File

@ -8,7 +8,6 @@
#include <EGL/egl.h> #include <EGL/egl.h>
#include "Common/GL/GLInterfaceBase.h" #include "Common/GL/GLInterfaceBase.h"
#include "Core/ConfigManager.h"
class cInterfaceEGL : public cInterfaceBase class cInterfaceEGL : public cInterfaceBase
{ {

1
Source/Core/Common/GL/GLInterface/EGLAndroid.cpp
View File

@ -3,7 +3,6 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Common/GL/GLInterface/EGLAndroid.h" #include "Common/GL/GLInterface/EGLAndroid.h"
#include "Core/Host.h"
EGLDisplay cInterfaceEGLAndroid::OpenDisplay() EGLDisplay cInterfaceEGLAndroid::OpenDisplay()
{ {

6
Source/Core/VideoBackends/OGL/Render.cpp
View File

@ -639,7 +639,8 @@ Renderer::Renderer()
// Handle VSync on/off // Handle VSync on/off
s_vsync = g_ActiveConfig.IsVSync(); s_vsync = g_ActiveConfig.IsVSync();
GLInterface->SwapInterval(s_vsync); if (!DriverDetails::HasBug(DriverDetails::BUG_BROKENVSYNC))
GLInterface->SwapInterval(s_vsync);
// TODO: Move these somewhere else? // TODO: Move these somewhere else?
FramebufferManagerBase::SetLastXfbWidth(MAX_XFB_WIDTH); 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()) if (s_vsync != g_ActiveConfig.IsVSync())
{ {
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. // Clean out old stuff from caches. It's not worth it to clean out the shader caches.