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

EGL: Fix android build broken by last commit

This commit is contained in:
Scott Moreau 2014-01-23 19:41:07 -07:00
parent d4ff195cad
commit 202054708b
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/GLInterface/EGL.cpp
View File

@ -173,9 +173,7 @@ bool cInterfaceEGL::Create(void *&window_handle)
else else
eglBindAPI(EGL_OPENGL_ES_API); eglBindAPI(EGL_OPENGL_ES_API);
GLWin.parent = (Window) window_handle; if (!Platform.Init(config, window_handle))
if (!Platform.Init(config))
return false; return false;
s = eglQueryString(GLWin.egl_dpy, EGL_VERSION); s = eglQueryString(GLWin.egl_dpy, EGL_VERSION);

2
Source/Core/DolphinWX/GLInterface/EGL.h
View File

@ -34,7 +34,7 @@ private:
public: public:
enum egl_platform platform; enum egl_platform platform;
bool SelectDisplay(void); bool SelectDisplay(void);
bool Init(EGLConfig config); bool Init(EGLConfig config, void *window_handle);
EGLDisplay EGLGetDisplay(void); EGLDisplay EGLGetDisplay(void);
EGLNativeWindowType CreateWindow(void); EGLNativeWindowType CreateWindow(void);
void DestroyWindow(void); void DestroyWindow(void);

4
Source/Core/DolphinWX/GLInterface/Platform.cpp
View File

@ -126,7 +126,7 @@ out:
return true; return true;
} }
bool cPlatform::Init(EGLConfig config) bool cPlatform::Init(EGLConfig config, void *window_handle)
{ {
#if HAVE_WAYLAND #if HAVE_WAYLAND
if (cPlatform::platform == EGL_PLATFORM_WAYLAND) if (cPlatform::platform == EGL_PLATFORM_WAYLAND)
@ -135,7 +135,7 @@ bool cPlatform::Init(EGLConfig config)
#endif #endif
#if HAVE_X11 #if HAVE_X11
if (cPlatform::platform == EGL_PLATFORM_X11) if (cPlatform::platform == EGL_PLATFORM_X11)
if (!XInterface.Initialize(config)) if (!XInterface.Initialize(config, window_handle))
return false; return false;
#endif #endif
#ifdef ANDROID #ifdef ANDROID

3
Source/Core/DolphinWX/GLInterface/X11_Util.cpp
View File

@ -30,7 +30,7 @@ bool cXInterface::ServerConnect(void)
return true; return true;
} }
bool cXInterface::Initialize(void *config) bool cXInterface::Initialize(void *config, void *window_handle)
{ {
int _tx, _ty, _twidth, _theight; int _tx, _ty, _twidth, _theight;
XVisualInfo visTemplate; XVisualInfo visTemplate;
@ -63,6 +63,7 @@ bool cXInterface::Initialize(void *config)
GLWin.height = _theight; GLWin.height = _theight;
GLWin.evdpy = XOpenDisplay(NULL); GLWin.evdpy = XOpenDisplay(NULL);
GLWin.parent = (Window) window_handle;
GLWin.screen = DefaultScreen(GLWin.dpy); GLWin.screen = DefaultScreen(GLWin.dpy);
if (GLWin.parent == 0) if (GLWin.parent == 0)

2
Source/Core/DolphinWX/GLInterface/X11_Util.h
View File

@ -28,7 +28,7 @@ private:
void XEventThread(); void XEventThread();
public: public:
bool ServerConnect(void); bool ServerConnect(void);
bool Initialize(void *config); bool Initialize(void *config, void *window_handle);
void *EGLGetDisplay(void); void *EGLGetDisplay(void);
void *CreateWindow(void); void *CreateWindow(void);
void DestroyWindow(void); void DestroyWindow(void);