这是indexloc提供的服务，不要输入任何密码
Skip to content

Improve stability and reduce native crashes #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Improve stability and reduce native crashes #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 22 additions & 13 deletions app/src/main/jni/lorie/egl-helper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@ void checkEGLError(int line) {

bool LorieEGLHelper::init(EGLNativeDisplayType display) {
EGLint majorVersion, minorVersion;

LOGV("Initializing EGL");
dpy = eglGetDisplay(display); checkEGLError();
if (dpy == EGL_NO_DISPLAY) {
LOGE("LorieEGLHelper::init : eglGetDisplay failed: %s", eglGetErrorText(eglGetError()));
return false;
}

if (eglInitialize(dpy, &majorVersion, &minorVersion) != EGL_TRUE) {
LOGE("LorieEGLHelper::init : eglInitialize failed: %s", eglGetErrorText(eglGetError()));
return false;
}

const EGLint configAttribs[] = {
EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
Expand All @@ -66,24 +66,24 @@ bool LorieEGLHelper::init(EGLNativeDisplayType display) {
}

eglBindAPI(EGL_OPENGL_ES_API);

const EGLint ctxattribs[] = {
EGL_CONTEXT_CLIENT_VERSION,
2, // Request opengl ES2.0
EGL_NONE
};
ctx = eglCreateContext(dpy, cfg, NULL, ctxattribs);

ctx = eglCreateContext(dpy, cfg, NULL, ctxattribs);
if (ctx == EGL_NO_CONTEXT) {
LOGE("LorieEGLHelper::init : eglCreateContext failed: %s", eglGetErrorText(eglGetError()));
return false;
}

if (eglMakeCurrent(dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONFIG_KHR) != EGL_TRUE) {
LOGE("LorieEGLHelper::init : eglMakeCurrent failed: %s", eglGetErrorText(eglGetError()));
return false;
}

return true;
}

Expand All @@ -99,22 +99,22 @@ bool LorieEGLHelper::setWindow(EGLNativeWindowType window) {
return false;
}
};

sfc = EGL_NO_SURFACE;
win = window;

if (win == EGL_NO_WINDOW) {
if (onUninit != nullptr) onUninit();
return true;
}

sfc = eglCreateWindowSurface(dpy, cfg, win, NULL);
if (sfc == EGL_NO_SURFACE) {
LOGE("LorieEGLHelper::setWindow : eglCreateWindowSurface failed: %s", eglGetErrorText(eglGetError()));
if (onUninit != nullptr) onUninit();
return false;
}

if (eglMakeCurrent(dpy, sfc, sfc, ctx) != EGL_TRUE) {
LOGE("LorieEGLHelper::setWindow : eglMakeCurrent failed: %s", eglGetErrorText(eglGetError()));
if (onUninit != nullptr) onUninit();
Expand All @@ -128,7 +128,7 @@ bool LorieEGLHelper::setWindow(EGLNativeWindowType window) {

if (onInit != nullptr)
onInit();

return true;
}

Expand Down Expand Up @@ -165,17 +165,26 @@ void LorieEGLHelper::uninit() {
LOGE("LorieEGLHelper::uninit : eglDestroyContext failed: %s", eglGetErrorText(eglGetError()));
return;
}
ctx = EGL_NO_CONTEXT;

if (ctx != NULL) {
ctx = EGL_NO_CONTEXT;
}

if (eglDestroySurface(dpy, sfc) != EGL_TRUE) {
LOGE("LorieEGLHelper::uninit : eglDestroySurface failed: %s", eglGetErrorText(eglGetError()));
return;
}

if (sfc != NULL) {
sfc = EGL_NO_SURFACE;
}

if (eglTerminate(dpy) != EGL_TRUE) {
LOGE("LorieEGLHelper::uninit : eglTerminate failed: %s", eglGetErrorText(eglGetError()));
return;
}

if (dpy != NULL) {
dpy = EGL_NO_DISPLAY;
}
}