summaryrefslogtreecommitdiffstats
path: root/opengl
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
commit2fa3af5b43ed6c4288fcc25ac05efbad17ef8bf2 (patch)
treea66e3e9ddd9fdd69ca66889e8e02fde7ace7b79f /opengl
parent06394ed7a46c3273280a3e0328bcebda87c5ea36 (diff)
parent18c35abd39d443ec77cd47b2c9047fa59ffa3eeb (diff)
downloadframeworks_native-2fa3af5b43ed6c4288fcc25ac05efbad17ef8bf2.zip
frameworks_native-2fa3af5b43ed6c4288fcc25ac05efbad17ef8bf2.tar.gz
frameworks_native-2fa3af5b43ed6c4288fcc25ac05efbad17ef8bf2.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')
-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;