summaryrefslogtreecommitdiffstats
path: root/opengl/libs/EGL/egl.cpp
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-12-08 17:20:39 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-12-08 17:20:39 -0800
commitcd505aef7201ccd7f028ac99a2ecfed96bf474de (patch)
treeb52f64b1d6c4cbc7767c311ca72fde0782286e4c /opengl/libs/EGL/egl.cpp
parentc106a9d1e38bd3044dcbecfbc58fba60cafaf2d4 (diff)
parent054ae78245fe9b4c14bbc372ae77cd0a977ded73 (diff)
downloadframeworks_base-cd505aef7201ccd7f028ac99a2ecfed96bf474de.zip
frameworks_base-cd505aef7201ccd7f028ac99a2ecfed96bf474de.tar.gz
frameworks_base-cd505aef7201ccd7f028ac99a2ecfed96bf474de.tar.bz2
am 054ae782: am e1752f41: Merge "fix [3258603] \'Quadrant\' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread
* commit '054ae78245fe9b4c14bbc372ae77cd0a977ded73': fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo
Diffstat (limited to 'opengl/libs/EGL/egl.cpp')
-rw-r--r--opengl/libs/EGL/egl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp
index d71ec1b..7acce02 100644
--- a/opengl/libs/EGL/egl.cpp
+++ b/opengl/libs/EGL/egl.cpp
@@ -220,8 +220,8 @@ struct egl_context_t : public egl_object_t
egl_context_t(EGLDisplay dpy, EGLContext context, EGLConfig config,
int impl, egl_connection_t const* cnx, int version)
- : dpy(dpy), context(context), read(0), draw(0), impl(impl), cnx(cnx),
- version(version)
+ : dpy(dpy), context(context), config(config), read(0), draw(0), impl(impl),
+ cnx(cnx), version(version)
{
}
EGLDisplay dpy;