andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

glamor: Fix up the wide/non-solid lines fallback.

Browse Source
This commit is contained in:
Eric Anholt 2010-02-11 15:00:32 -08:00 committed by Zhigang Gong
parent d61a13cf3f
commit a63df0c504
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
glamor/glamor_polylines.c
View File

@ -52,13 +52,13 @@ glamor_poly_lines(DrawablePtr drawable, GCPtr gc, int mode, int n,
/* Don't try to do wide lines or non-solid fill style. */ /* Don't try to do wide lines or non-solid fill style. */
if (gc->lineWidth != 0) { if (gc->lineWidth != 0) {
ErrorF("stub wide polylines\n"); glamor_fallback("glamor_poly_lines(): wide lines\n");
return; goto fail;
} }
if (gc->lineStyle != LineSolid || if (gc->lineStyle != LineSolid ||
gc->fillStyle != FillSolid) { gc->fillStyle != FillSolid) {
ErrorF("stub poly_line non-solid fill\n"); glamor_fallback("glamor_poly_lines(): non-solid fill\n");
return; goto fail;
} }
rects = xalloc(sizeof(xRectangle) * (n - 1)); rects = xalloc(sizeof(xRectangle) * (n - 1));
@ -104,4 +104,19 @@ glamor_poly_lines(DrawablePtr drawable, GCPtr gc, int mode, int n,
} }
gc->ops->PolyFillRect(drawable, gc, n - 1, rects); gc->ops->PolyFillRect(drawable, gc, n - 1, rects);
xfree(rects); xfree(rects);
return;
fail:
if (gc->lineWidth == 0) {
if (glamor_prepare_access(drawable, GLAMOR_ACCESS_RW)) {
if (glamor_prepare_access_gc(gc)) {
fbPolyLine(drawable, gc, mode, n, points);
glamor_finish_access_gc(gc);
}
glamor_finish_access(drawable);
}
return;
}
/* fb calls mi functions in the lineWidth != 0 case. */
fbPolyLine(drawable, gc, mode, n, points);
} }