Merge pull request #7307 from m4xw/develop

[LIBNX] Mesa EGL backend has been fixed, remove workaround.
This commit is contained in:
Twinaphex 2018-09-27 21:03:00 +02:00 committed by GitHub
commit 7c2291cc62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 9 deletions

View File

@ -163,12 +163,7 @@ static void frontend_switch_deinit(void *data)
splashData = NULL;
}
#ifdef HAVE_OPENGL
// Workaround for eglTerminate/re-init bug
egl_destroy(&nx_ctx_ptr->egl);
nx_ctx_ptr->resize = false;
free(nx_ctx_ptr);
#else
#ifndef HAVE_OPENGL
gfxExit();
#endif
#endif

View File

@ -34,11 +34,10 @@ void switch_ctx_destroy(void *data)
if (ctx_nx)
{
#ifdef HAVE_EGL
// Workaround for eglTerminate/re-init bug, other part in platform_switch.c
//egl_destroy(&ctx_nx->egl);
egl_destroy(&ctx_nx->egl);
#endif
ctx_nx->resize = false;
//free(ctx_nx);
free(ctx_nx);
}
}