diff options
| author | Brian Paul <[email protected]> | 2009-06-24 08:54:37 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-06-24 08:54:37 -0600 |
| commit | a04af335a42ce3b28e59ff9b85b2bd433a9d7b12 (patch) | |
| tree | 768262f4e8e4a9f49c64b76882c48f1ede445dd5 /src/glx | |
| parent | d60b2c68552a2729dfdb33c2bac4822453cf8ae2 (diff) | |
| parent | c25534f30d326c15dff845775d9bd55ba6064049 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/drivers/dri/i915/i915_tex_layout.c
src/mesa/drivers/dri/i965/brw_wm_glsl.c
src/mesa/drivers/dri/intel/intel_buffer_objects.c
src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
src/mesa/drivers/dri/intel/intel_pixel_draw.c
src/mesa/main/enums.c
src/mesa/main/texstate.c
src/mesa/vbo/vbo_exec_array.c
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/x11/glxcmds.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c index ec3e69e4fe1..77471b8599c 100644 --- a/src/glx/x11/glxcmds.c +++ b/src/glx/x11/glxcmds.c @@ -869,6 +869,20 @@ PUBLIC void glXDestroyGLXPixmap(Display *dpy, GLXPixmap glxpixmap) req->glxpixmap = glxpixmap; UnlockDisplay(dpy); SyncHandle(); + +#ifdef GLX_DIRECT_RENDERING + { + int screen; + __GLXdisplayPrivate *const priv = __glXInitialize(dpy); + __GLXDRIdrawable *pdraw = GetGLXDRIDrawable(dpy, glxpixmap, &screen); + __GLXscreenConfigs *psc = &priv->screenConfigs[screen]; + + if (pdraw != NULL) { + (*pdraw->destroyDrawable) (pdraw); + __glxHashDelete(psc->drawHash, glxpixmap); + } + } +#endif } PUBLIC void glXSwapBuffers(Display *dpy, GLXDrawable drawable) |