diff options
author | Chia-I Wu <olvaffe@gmail.com> | 2010-01-22 14:41:00 +0800 |
---|---|---|
committer | Chia-I Wu <olvaffe@gmail.com> | 2010-01-22 15:06:06 +0800 |
commit | cfb1ed39771c7f3876a8231ab1c8a8d6f7b5deae (patch) | |
tree | c038f85e50bcb015c8477e8142bf12fa29b23758 /src/gallium/state_trackers/egl_g3d/x11/x11_screen.c | |
parent | 29732f982cb0ad3bd9c81da2ba9f64b9205ff6b0 (diff) |
st/egl_g3d: Use glxinit.c from egl_xdri.
It is used to fetch the GLX visuals/fbconfigs. Use egl_xdri's version
to avoid duplication. It might be better to rewrite that part though.
Diffstat (limited to 'src/gallium/state_trackers/egl_g3d/x11/x11_screen.c')
-rw-r--r-- | src/gallium/state_trackers/egl_g3d/x11/x11_screen.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/egl_g3d/x11/x11_screen.c b/src/gallium/state_trackers/egl_g3d/x11/x11_screen.c index fef7878ab9..76ce45ee57 100644 --- a/src/gallium/state_trackers/egl_g3d/x11/x11_screen.c +++ b/src/gallium/state_trackers/egl_g3d/x11/x11_screen.c @@ -42,6 +42,10 @@ struct x11_screen { Display *dpy; int number; + /* + * This is used to fetch GLX visuals/fbconfigs. It uses code from egl_xdri. + * It might be better to rewrite the part in Xlib or XCB. + */ __GLXdisplayPrivate *glx_dpy; int dri_major, dri_minor; @@ -93,8 +97,8 @@ x11_screen_destroy(struct x11_screen *xscr) if (xscr->dri_device) Xfree(xscr->dri_device); - if (xscr->glx_dpy) - __glXRelease(xscr->glx_dpy); + /* xscr->glx_dpy will be destroyed with the X display */ + if (xscr->visuals) XFree(xscr->visuals); free(xscr); |