encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WinRT: fixed crash on ARM and x64 during OpenGL window init

This commit is contained in:
David Ludwig 2013-12-26 13:59:01 -05:00
parent 0562e53fdf
commit fed81d121a
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/video/winrt/SDL_winrtvideo.cpp
View File

@ -266,8 +266,27 @@ WINRT_CreateWindow(_THIS, SDL_Window * window)
data->egl_surface = EGL_NO_SURFACE; data->egl_surface = EGL_NO_SURFACE;
} else { } else {
/* OpenGL ES 2 was reuqested. Set up an EGL surface. */ /* OpenGL ES 2 was reuqested. Set up an EGL surface. */
IUnknown * nativeWindow = reinterpret_cast<IUnknown *>(data->coreWindow.Get());
data->egl_surface = SDL_EGL_CreateSurface(_this, nativeWindow); /* HACK: ANGLE/WinRT currently uses non-pointer, C++ objects to represent
native windows. The object only contains a single pointer to a COM
interface pointer, which on x86 appears to be castable to the object
without apparant problems. On other platforms, notable ARM and x64,
doing so will cause a crash. To avoid this crash, we'll bypass
SDL's normal call to eglCreateWindowSurface, which is invoked from C
code, and call it here, where an appropriate C++ object may be
passed in.
*/
typedef EGLSurface (*eglCreateWindowSurfaceFunction)(EGLDisplay dpy, EGLConfig config,
Microsoft::WRL::ComPtr<IUnknown> win,
const EGLint *attrib_list);
eglCreateWindowSurfaceFunction WINRT_eglCreateWindowSurface =
(eglCreateWindowSurfaceFunction) _this->egl_data->eglCreateWindowSurface;
Microsoft::WRL::ComPtr<IUnknown> nativeWindow = reinterpret_cast<IUnknown *>(data->coreWindow.Get());
data->egl_surface = WINRT_eglCreateWindowSurface(
_this->egl_data->egl_display,
_this->egl_data->egl_config,
nativeWindow, NULL);
if (data->egl_surface == NULL) { if (data->egl_surface == NULL) {
// TODO, WinRT: see if SDL_EGL_CreateSurface, or its callee(s), sets an error message. If so, attach it to the SDL error. // TODO, WinRT: see if SDL_EGL_CreateSurface, or its callee(s), sets an error message. If so, attach it to the SDL error.
return SDL_SetError("SDL_EGL_CreateSurface failed"); return SDL_SetError("SDL_EGL_CreateSurface failed");