| commit | f652f506734ff36069f5100766d557cd9b82d29e | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Thu Mar 27 11:07:20 2014 +0100 |
| committer | David 'Digit' Turner <digit@google.com> | Tue Apr 01 10:22:22 2014 +0200 |
| tree | 1239730f9e33908f9e5cd43ff37ee6bf1cbab48c | |
| parent | ef6d66cbf5409ac46b4f01b5e3c9be07ab026a43 [diff] |
emulator/opengl: Fix eglWaitGL implementation. The eglWaitEGL implementation didn't restore the previous bound API after calling eglWaitClient. This probably isn't a big concern for emugl correctness, but fixing this removes a compiler warning. See http://www.khronos.org/registry/egl/sdk/docs/man/xhtml/eglWaitGL.html Change-Id: I143ffeeefa01aff502d27d4e1d6f892f0d1efe5b
diff --git a/emulator/opengl/host/libs/Translator/EGL/EglImp.cpp b/emulator/opengl/host/libs/Translator/EGL/EglImp.cpp index e31dea5..d88b473 100644 --- a/emulator/opengl/host/libs/Translator/EGL/EglImp.cpp +++ b/emulator/opengl/host/libs/Translator/EGL/EglImp.cpp
@@ -858,7 +858,9 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitGL(void) { EGLenum api = eglQueryAPI(); eglBindAPI(EGL_OPENGL_ES_API); - return eglWaitClient(); + EGLBoolean ret = eglWaitClient(); + eglBindAPI(api); + return ret; } EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative(EGLint engine) {