diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-12-01 14:54:32 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-12-01 14:54:32 +0000 |
| commit | b7f94c9002bd8578e89ce02a22172545ace353a3 (patch) | |
| tree | d4df544d04e4c6b2b55586d5b1539dcd63a489b1 /src/gallium/state_trackers/xorg/xorg_exa.c | |
| parent | 87eec80c1120d2cd9749ee360b77922feabf7f10 (diff) | |
st/xorg: fix merge droppings
These were stranded in emacs and not saved before committing.
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, 0 insertions, 4 deletions
diff --git a/src/gallium/state_trackers/xorg/xorg_exa.c b/src/gallium/state_trackers/xorg/xorg_exa.c index 16e683019c..aa46cd45f1 100644 --- a/src/gallium/state_trackers/xorg/xorg_exa.c +++ b/src/gallium/state_trackers/xorg/xorg_exa.c @@ -283,13 +283,9 @@ ExaPrepareAccess(PixmapPtr pPix, int index) PIPE_TRANSFER_MAP_DIRECTLY | #endif PIPE_TRANSFER_READ_WRITE, -<<<<<<< HEAD:src/gallium/state_trackers/xorg/xorg_exa.c - 0, 0, priv->tex->width0, priv->tex->height0); -======= 0, 0, pPix->drawable.width, pPix->drawable.height ); ->>>>>>> origin/mesa_7_7_branch:src/gallium/state_trackers/xorg/xorg_exa.c if (!priv->map_transfer) #ifdef EXA_MIXED_PIXMAPS return FALSE; |