Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna: Cleanup PolyText and ImageText fallback debugging 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-01-20 22:17:44 +00:00
parent 3fbd7cafb4
commit 20006a9ae7
1 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/sna/sna_accel.c
View File

@ -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(&region))
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, &region, 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(&region))
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, &region, 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(&region))
return;
if (FORCE_FALLBACK)
goto force_fallback;
if (!ACCEL_IMAGE_TEXT8)
goto force_fallback;
if (!sna_glyph_blt(drawable, gc, x, y, n, info, &region, 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(&region))
return;
if (FORCE_FALLBACK)
goto force_fallback;
if (!ACCEL_IMAGE_TEXT16)
goto force_fallback;
if (!sna_glyph_blt(drawable, gc, x, y, n, info, &region, 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, &region.extents, &damage) &&
sna_reversed_glyph_blt(drawable, gc, x, y, n, info, base,
damage, &region, false)) {
RegionUninit(&region);
return;
}
damage, &region, 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, &region.extents, &damage) &&
sna_reversed_glyph_blt(drawable, gc, x, y, n, info, base,
damage, &region, true)) {
RegionUninit(&region);
return;
}
damage, &region, true))
goto out;
fallback:
DBG(("%s: fallback\n", __FUNCTION__));