tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] Restore old GL context after createSurface

Browse Source 
Fixes #2807
This commit is contained in:
Leith Bade
2015-10-27 12:34:32 +11:00
parent d48c640b5c
commit fd33dfcd73
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/android/native_map_view.cpp
View File

@@ -398,6 +398,11 @@ void NativeMapView::createSurface(ANativeWindow *window_) {
if (!firstTime) {
firstTime = true;
EGLDisplay oldDisplay = eglGetCurrentDisplay();
EGLSurface oldReadSurface = eglGetCurrentSurface(EGL_READ);
EGLSurface oldDrawSurface = eglGetCurrentSurface(EGL_DRAW);
EGLContext oldContext = eglGetCurrentContext();
if (!eglMakeCurrent(display, surface, surface, context)) {
mbgl::Log::Error(mbgl::Event::OpenGL, "eglMakeCurrent() returned error %d",
eglGetError());
@@ -418,7 +423,7 @@ void NativeMapView::createSurface(ANativeWindow *window_) {
return reinterpret_cast<mbgl::gl::glProc>(eglGetProcAddress(name));
});
if (!eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT)) {
if (!eglMakeCurrent(oldDisplay, oldDrawSurface, oldReadSurface, oldContext)) {
mbgl::Log::Error(mbgl::Event::OpenGL,
"eglMakeCurrent(EGL_NO_CONTEXT) returned error %d", eglGetError());
throw new std::runtime_error("eglMakeCurrent() failed");