diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-06 08:50:13 +0100 |
|---|---|---|
| committer | Owain G. Ainsworth <oga@openbsd.org> | 2011-03-16 18:43:54 +0000 |
| commit | 5e78d10b7f25e200d891bdaddc2b9d140b8c6d37 (patch) | |
| tree | ff377d40a9aa9457997190127de6e87bbacf63d9 /src/intel_uxa.c | |
| parent | 38f467ce6a521b58384f9a0ee5088df52da4f383 (diff) | |
Revert "Clear pixmap->devPrivate.ptr [regression in 7c7294e]"
This reverts commit 48b4e224297fa807be0e2bc7a67bf7e94579e8de.
The better fix is to manually mark the pixmap when acceleration is and
is not permitted. Whilst the devPrivate.ptr are invalid upon creation,
it is not worth carring code that serves no purpose.
(cherry picked from commit 54f545e0631a287f421ef6a6f20831624b212cf2)
Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>
Diffstat (limited to 'src/intel_uxa.c')
| -rw-r--r-- | src/intel_uxa.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/intel_uxa.c b/src/intel_uxa.c index 694b7502..cfa30ab0 100644 --- a/src/intel_uxa.c +++ b/src/intel_uxa.c @@ -783,7 +783,6 @@ static Bool intel_uxa_put_image(PixmapPtr pixmap, w, h, 0, 0, stride, NULL); - pixmap->devPrivate.ptr = NULL; intel_set_pixmap_bo(pixmap, bo); dri_bo_unreference(bo); @@ -1027,7 +1026,6 @@ intel_uxa_create_pixmap(ScreenPtr screen, int w, int h, int depth, list_del(&priv->in_flight); screen->ModifyPixmapHeader(pixmap, w, h, 0, 0, stride, NULL); - pixmap->devPrivate.ptr = NULL; intel_set_pixmap_private(pixmap, priv); return pixmap; } @@ -1063,7 +1061,6 @@ intel_uxa_create_pixmap(ScreenPtr screen, int w, int h, int depth, priv->tiling = tiling; screen->ModifyPixmapHeader(pixmap, w, h, 0, 0, stride, NULL); - pixmap->devPrivate.ptr = NULL; list_init(&priv->batch); list_init(&priv->flush); @@ -1100,7 +1097,6 @@ void intel_uxa_create_screen_resources(ScreenPtr screen) -1, -1, intel->front_pitch, NULL); - pixmap->devPrivate.ptr = NULL; } scrn->displayWidth = intel->front_pitch / intel->cpp; } |