xf86-video-intel: 2 commits - src/sna/sna_glyphs.c src/sna/sna_io.c
Chris Wilson
ickle at kemper.freedesktop.org
Thu May 17 10:01:01 PDT 2012
src/sna/sna_glyphs.c | 2 +-
src/sna/sna_io.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit d99502a33d5bdbad010b7a036c1aee989fe29947
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu May 17 17:56:43 2012 +0100
sna/glyphs: Pass the extents to the backend for preparing to composite glyphs
This information should not be required, but it might come in handy, so
pass it along.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c
index 07b2a94..2af7e80 100644
--- a/src/sna/sna_glyphs.c
+++ b/src/sna/sna_glyphs.c
@@ -920,7 +920,7 @@ next_image:
if (!sna->render.composite(sna, PictOpAdd,
this_atlas, NULL, mask,
0, 0, 0, 0, 0, 0,
- 0, 0,
+ width, height,
&tmp)) {
FreePicture(mask, 0);
return FALSE;
commit fb21c2df1a10d66f115a5978b0db508058fdc412
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu May 17 16:30:31 2012 +0100
sna/io: Assert that we do not replace a bo->flush object
These should be pinned by the higher layers and so we should never be
attempting to replace them. If we do replace a bo->flush, then we will
end up miscounting outstanding flush bo.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_io.c b/src/sna/sna_io.c
index b4e59d9..3f39de5 100644
--- a/src/sna/sna_io.c
+++ b/src/sna/sna_io.c
@@ -1147,6 +1147,7 @@ bool sna_replace(struct sna *sna,
pixmap->drawable.height,
pixmap->drawable.bitsPerPixel,
bo->tiling));
+ assert(!bo->flush);
if ((!kgem_bo_can_map(kgem, bo) || kgem_bo_is_busy(bo)) &&
indirect_replace(sna, pixmap, bo, src, stride))
@@ -1222,6 +1223,7 @@ struct kgem_bo *sna_replace__xor(struct sna *sna,
pixmap->drawable.height,
pixmap->drawable.bitsPerPixel,
bo->tiling));
+ assert(!bo->flush);
if (kgem_bo_is_busy(bo)) {
struct kgem_bo *new_bo;
More information about the xorg-commit
mailing list