summaryrefslogtreecommitdiffstats
path: root/libs/gui
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2014-10-30 20:58:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-30 20:58:43 +0000
commitf12f15502a3092a9f7f28cf45b1a00e2efbd6eac (patch)
tree8dbf5884b6774cbf60cce9dce8d850d005d85a60 /libs/gui
parentd77021637e28e66be3fcc097b16869df69717df9 (diff)
parent1834f8ea975e9a882b44dc479320fe02e306e630 (diff)
downloadframeworks_native-f12f15502a3092a9f7f28cf45b1a00e2efbd6eac.zip
frameworks_native-f12f15502a3092a9f7f28cf45b1a00e2efbd6eac.tar.gz
frameworks_native-f12f15502a3092a9f7f28cf45b1a00e2efbd6eac.tar.bz2
am 1834f8ea: GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
* commit '1834f8ea975e9a882b44dc479320fe02e306e630': GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
Diffstat (limited to 'libs/gui')
-rw-r--r--libs/gui/GLConsumer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/gui/GLConsumer.cpp b/libs/gui/GLConsumer.cpp
index 1046935..b886c5b 100644
--- a/libs/gui/GLConsumer.cpp
+++ b/libs/gui/GLConsumer.cpp
@@ -505,7 +505,7 @@ status_t GLConsumer::checkAndUpdateEglStateLocked(bool contextCheck) {
if (mEglDisplay == EGL_NO_DISPLAY) {
mEglDisplay = dpy;
}
- if (mEglContext == EGL_NO_DISPLAY) {
+ if (mEglContext == EGL_NO_CONTEXT) {
mEglContext = ctx;
}
}