diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-01-20 22:17:44 +0000 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-01-20 22:17:44 +0000 |
commit | 20006a9ae7f993f02c45ccbc1e414d74bfee3acd (patch) | |
tree | 52669ef736f72af7b575c609dadd9b096a839789 | |
parent | 3fbd7cafb4394e0641565dc794b82bef615b4aac (diff) |
sna: Cleanup PolyText and ImageText fallback debugging
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r-- | src/sna/sna_accel.c | 62 |
1 files changed, 29 insertions, 33 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index 08a5e250..8801477e 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -9099,12 +9099,6 @@ sna_poly_text8(DrawablePtr drawable, GCPtr gc, if (drawable->depth < 8) goto fallback; - if (FORCE_FALLBACK) - goto force_fallback; - - if (!ACCEL_POLY_TEXT8) - goto force_fallback; - for (i = n = 0; i < count; i++) { if (sna_get_glyph8(gc->font, priv, chars[i], &info[n])) n++; @@ -9128,6 +9122,12 @@ sna_poly_text8(DrawablePtr drawable, GCPtr gc, if (!RegionNotEmpty(®ion)) return x + extents.overallRight; + if (FORCE_FALLBACK) + goto force_fallback; + + if (!ACCEL_POLY_TEXT8) + goto force_fallback; + if (!sna_glyph_blt(drawable, gc, x, y, n, info, ®ion, true)) { force_fallback: DBG(("%s: fallback\n", __FUNCTION__)); @@ -9181,13 +9181,7 @@ sna_poly_text16(DrawablePtr drawable, GCPtr gc, if (drawable->depth < 8) goto fallback; - if (FORCE_FALLBACK) - goto force_fallback; - - if (!ACCEL_POLY_TEXT16) - goto force_fallback; - - for (i = n = 0; i < count; i++) { + for (i = n = 0; i < count; i++) { if (sna_get_glyph16(gc->font, priv, chars[i], &info[n])) n++; } @@ -9210,6 +9204,12 @@ sna_poly_text16(DrawablePtr drawable, GCPtr gc, if (!RegionNotEmpty(®ion)) return x + extents.overallRight; + if (FORCE_FALLBACK) + goto force_fallback; + + if (!ACCEL_POLY_TEXT16) + goto force_fallback; + if (!sna_glyph_blt(drawable, gc, x, y, n, info, ®ion, true)) { force_fallback: DBG(("%s: fallback\n", __FUNCTION__)); @@ -9263,12 +9263,6 @@ sna_image_text8(DrawablePtr drawable, GCPtr gc, if (drawable->depth < 8) goto fallback; - if (FORCE_FALLBACK) - goto force_fallback; - - if (!ACCEL_IMAGE_TEXT8) - goto force_fallback; - for (i = n = 0; i < count; i++) { if (sna_get_glyph8(gc->font, priv, chars[i], &info[n])) n++; @@ -9292,6 +9286,12 @@ sna_image_text8(DrawablePtr drawable, GCPtr gc, if (!RegionNotEmpty(®ion)) return; + if (FORCE_FALLBACK) + goto force_fallback; + + if (!ACCEL_IMAGE_TEXT8) + goto force_fallback; + if (!sna_glyph_blt(drawable, gc, x, y, n, info, ®ion, false)) { force_fallback: DBG(("%s: fallback\n", __FUNCTION__)); @@ -9337,12 +9337,6 @@ sna_image_text16(DrawablePtr drawable, GCPtr gc, if (drawable->depth < 8) goto fallback; - if (FORCE_FALLBACK) - goto force_fallback; - - if (!ACCEL_IMAGE_TEXT16) - goto force_fallback; - for (i = n = 0; i < count; i++) { if (sna_get_glyph16(gc->font, priv, chars[i], &info[n])) n++; @@ -9366,6 +9360,12 @@ sna_image_text16(DrawablePtr drawable, GCPtr gc, if (!RegionNotEmpty(®ion)) return; + if (FORCE_FALLBACK) + goto force_fallback; + + if (!ACCEL_IMAGE_TEXT16) + goto force_fallback; + if (!sna_glyph_blt(drawable, gc, x, y, n, info, ®ion, false)) { force_fallback: DBG(("%s: fallback\n", __FUNCTION__)); @@ -9615,10 +9615,8 @@ sna_image_glyph(DrawablePtr drawable, GCPtr gc, if (sna_drawable_use_gpu_bo(drawable, ®ion.extents, &damage) && sna_reversed_glyph_blt(drawable, gc, x, y, n, info, base, - damage, ®ion, false)) { - RegionUninit(®ion); - return; - } + damage, ®ion, false)) + goto out; fallback: DBG(("%s: fallback\n", __FUNCTION__)); @@ -9683,10 +9681,8 @@ sna_poly_glyph(DrawablePtr drawable, GCPtr gc, if (sna_drawable_use_gpu_bo(drawable, ®ion.extents, &damage) && sna_reversed_glyph_blt(drawable, gc, x, y, n, info, base, - damage, ®ion, true)) { - RegionUninit(®ion); - return; - } + damage, ®ion, true)) + goto out; fallback: DBG(("%s: fallback\n", __FUNCTION__)); |