projects
/
profile
/
ivi
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
366efd8
)
st/xorg: Simplify EXA ModifyPixmapHeader hook for pPixmap != NULL.
author
Michel Dänzer
<daenzer@vmware.com>
Mon, 31 Aug 2009 16:41:54 +0000
(18:41 +0200)
committer
Michel Dänzer
<daenzer@vmware.com>
Mon, 31 Aug 2009 16:41:54 +0000
(18:41 +0200)
Just let the upper layers handle it.
src/gallium/state_trackers/xorg/xorg_exa.c
patch
|
blob
|
history
diff --git
a/src/gallium/state_trackers/xorg/xorg_exa.c
b/src/gallium/state_trackers/xorg/xorg_exa.c
index
7b607cb
..
5d205dd
100644
(file)
--- a/
src/gallium/state_trackers/xorg/xorg_exa.c
+++ b/
src/gallium/state_trackers/xorg/xorg_exa.c
@@
-427,7
+427,7
@@
ExaModifyPixmapHeader(PixmapPtr pPixmap, int width, int height,
modesettingPtr ms = modesettingPTR(pScrn);
struct exa_context *exa = ms->exa;
modesettingPtr ms = modesettingPTR(pScrn);
struct exa_context *exa = ms->exa;
- if (!priv)
+ if (!priv
|| pPixData
)
return FALSE;
if (depth <= 0)
return FALSE;
if (depth <= 0)
@@
-476,24
+476,11
@@
ExaModifyPixmapHeader(PixmapPtr pPixmap, int width, int height,
}
#ifdef DRM_MODE_FEATURE_DIRTYFB
}
#ifdef DRM_MODE_FEATURE_DIRTYFB
- if (!priv->tex) {
- if (pPixData)
- pPixmap->devPrivate.ptr = pPixData;
- else
+ if (!priv->tex)
pPixmap->devPrivate.ptr = xalloc(pPixmap->drawable.height * pPixmap->devKind);
pPixmap->devPrivate.ptr = xalloc(pPixmap->drawable.height * pPixmap->devKind);
- } else
#endif
#endif
- if (pPixData) {
- struct pipe_transfer *transfer =
- exa->scrn->get_tex_transfer(exa->scrn, priv->tex, 0, 0, 0,
- PIPE_TRANSFER_WRITE,
- 0, 0, width, height);
- util_copy_rect(exa->scrn->transfer_map(exa->scrn, transfer),
- &priv->tex->block, transfer->stride, 0, 0,
- width, height, pPixData, pPixmap->devKind, 0, 0);
- exa->scrn->transfer_unmap(exa->scrn, transfer);
- exa->scrn->tex_transfer_destroy(transfer);
- } else if (priv->tex && pPixmap->devPrivate.ptr) {
+
+ if (priv->tex && pPixmap->devPrivate.ptr) {
struct pipe_transfer *transfer;
if (priv->map_count != 0)
struct pipe_transfer *transfer;
if (priv->map_count != 0)