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

EGL: Stop the window_handle shuffling as well

This commit is contained in:
Jasper St. Pierre 2014-08-09 10:23:28 -04:00
parent e7471958e4
commit e2e3f2a20b
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,9 +156,11 @@ bool cInterfaceEGL::Create(void *&window_handle)
else else
eglBindAPI(EGL_OPENGL_ES_API); eglBindAPI(EGL_OPENGL_ES_API);
EGLNativeWindowType native_window = window_handle;
EGLint format; EGLint format;
eglGetConfigAttrib(GLWin.egl_dpy, config, EGL_NATIVE_VISUAL_ID, &format); eglGetConfigAttrib(GLWin.egl_dpy, config, EGL_NATIVE_VISUAL_ID, &format);
ANativeWindow_setBuffersGeometry((EGLNativeWindowType)Host_GetRenderHandle(), 0, 0, format); ANativeWindow_setBuffersGeometry(native_window, 0, 0, format);
int none, width, height; int none, width, height;
Host_GetRenderWindowSize(none, none, width, height); Host_GetRenderWindowSize(none, none, width, height);
GLWin.width = width; GLWin.width = width;
@ -184,16 +186,13 @@ bool cInterfaceEGL::Create(void *&window_handle)
exit(1); exit(1);
} }
GLWin.native_window = Host_GetRenderHandle(); GLWin.egl_surf = eglCreateWindowSurface(GLWin.egl_dpy, config, native_window, nullptr);
GLWin.egl_surf = eglCreateWindowSurface(GLWin.egl_dpy, config, GLWin.native_window, nullptr);
if (!GLWin.egl_surf) if (!GLWin.egl_surf)
{ {
INFO_LOG(VIDEO, "Error: eglCreateWindowSurface failed\n"); INFO_LOG(VIDEO, "Error: eglCreateWindowSurface failed\n");
exit(1); exit(1);
} }
window_handle = (void *)GLWin.native_window;
return true; return true;
} }

1
Source/Core/DolphinWX/GLInterface/GLInterface.h
View File

@ -24,7 +24,6 @@ typedef struct {
EGLSurface egl_surf; EGLSurface egl_surf;
EGLContext egl_ctx; EGLContext egl_ctx;
EGLDisplay egl_dpy; EGLDisplay egl_dpy;
EGLNativeWindowType native_window;
#elif defined(__APPLE__) #elif defined(__APPLE__)
NSView *cocoaWin; NSView *cocoaWin;
NSOpenGLContext *cocoaCtx; NSOpenGLContext *cocoaCtx;