diff options
| author | Brian Paul <brianp@vmware.com> | 2009-12-31 09:02:27 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-12-31 09:02:27 -0700 |
| commit | 25024d948298a9f3f3210a0b91486f79a3917b0f (patch) | |
| tree | 5647623b9781193b7ed55c8d9233404938aeb853 /src/gallium/state_trackers/xorg/xorg_exa.c | |
| parent | d14beea534dcb2b3ae2ae1f7ee0ba5dcdef3dba3 (diff) | |
| parent | 195e7657e2f15f7ad8b22042b86bcf33c5bba76b (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
configs/darwin
src/gallium/auxiliary/util/u_clear.h
src/gallium/state_trackers/xorg/xorg_exa_tgsi.c
src/mesa/drivers/dri/i965/brw_draw_upload.c
Diffstat (limited to 'src/gallium/state_trackers/xorg/xorg_exa.c')
| -rw-r--r-- | src/gallium/state_trackers/xorg/xorg_exa.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/state_trackers/xorg/xorg_exa.c b/src/gallium/state_trackers/xorg/xorg_exa.c index d5c005ebad..aa68570b9c 100644 --- a/src/gallium/state_trackers/xorg/xorg_exa.c +++ b/src/gallium/state_trackers/xorg/xorg_exa.c @@ -516,6 +516,7 @@ ExaCopy(PixmapPtr pDstPixmap, int srcX, int srcY, int dstX, int dstY, #endif debug_assert(priv == exa->copy.dst); + (void) priv; if (exa->copy.use_surface_copy) { /* XXX: consider exposing >1 box in surface_copy interface. @@ -1019,6 +1020,9 @@ xorg_exa_close(ScrnInfoPtr pScrn) if (exa->pipe) exa->pipe->destroy(exa->pipe); + exa->pipe = NULL; + /* Since this was shared be proper with the pointer */ + ms->ctx = NULL; exaDriverFini(pScrn->pScreen); xfree(exa); |