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

[android] Make the correct GL context current

Browse Source
This commit is contained in:
Thiago Marcos P. Santos
2016-04-13 20:16:10 +03:00
committed by John Firebaugh
parent 7b3c61f619
commit ba3125142e
1 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
platform/android/src/native_map_view.cpp
View File

@@ -380,11 +380,6 @@ 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());
@@ -404,21 +399,6 @@ void NativeMapView::createSurface(ANativeWindow *window_) {
mbgl::gl::InitializeExtensions([] (const char * name) {
return reinterpret_cast<mbgl::gl::glProc>(eglGetProcAddress(name));
});
if (oldDisplay == EGL_NO_DISPLAY) {
oldDisplay = display;
}
if (!eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT)) {
mbgl::Log::Error(mbgl::Event::OpenGL,"eglMakeCurrent(EGL_NO_CONTEXT) returned error %d", eglGetError());
throw std::runtime_error("eglMakeCurrent() failed");
}
if (!eglMakeCurrent(oldDisplay, oldDrawSurface, oldReadSurface, oldContext)) {
mbgl::Log::Error(mbgl::Event::OpenGL,
"eglMakeCurrent(EGL_NO_CONTEXT) returned error %d", eglGetError());
throw std::runtime_error("eglMakeCurrent() failed");
}
}
}