Merge "fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread

pixelflinger · Android (Google) Code Review · commit e1752f41d342 · 2010-12-08T16:17:02.000-08:00
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp
@@ -218,8 +218,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;

Original file line number	Diff line number	Diff line change
`@@ -218,8 +218,8 @@ struct egl_context_t : public egl_object_t`
`218`	`218`
`219`	`219`	`egl_context_t(EGLDisplay dpy, EGLContext context, EGLConfig config,`
`220`	`220`	`int impl, egl_connection_t const* cnx, int version)`
`221`		`- : dpy(dpy), context(context), read(0), draw(0), impl(impl), cnx(cnx),`
`222`		`- version(version)`
	`221`	`+ : dpy(dpy), context(context), config(config), read(0), draw(0), impl(impl),`
	`222`	`+ cnx(cnx), version(version)`
`223`	`223`	`{`
`224`	`224`	`}`
`225`	`225`	`EGLDisplay dpy;`