Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-09-10 04:16:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge Platform.h into GLInterface.h

Browse Source
This commit is contained in:
Scott Moreau
2014-01-19 19:06:55 -07:00
parent 75020b9b51
commit 4b3c338930
8 changed files with 101 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/DolphinWX/GLInterface/Wayland_Util.cpp
View File

@@ -360,11 +360,7 @@ bool cWaylandInterface::Initialize(void *config)
void *cWaylandInterface::EGLGetDisplay(void)
{
#if HAVE_X11
return eglGetDisplay((_XDisplay *) GLWin.wl_display);
#else
return eglGetDisplay(GLWin.wl_display);
#endif
}
void *cWaylandInterface::CreateWindow(void)
@@ -393,9 +389,6 @@ void cWaylandInterface::DestroyWindow(void)
wl_shell_surface_destroy(GLWin.wl_shell_surface);
wl_surface_destroy(GLWin.wl_surface);
if (GLWin.wl_callback)
wl_callback_destroy(GLWin.wl_callback);
}
void cWaylandInterface::UpdateFPSDisplay(const char *text)