glamor: Add fallback code path for glamor_fill.
This commit is contained in:
parent
8593f22fb8
commit
cd43b1ea83
|
@ -84,6 +84,20 @@ glamor_fill(DrawablePtr drawable,
|
||||||
drawable->y + y - gc->patOrg.y);
|
drawable->y + y - gc->patOrg.y);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
return;
|
||||||
|
#if 0
|
||||||
|
fail:
|
||||||
|
glamor_fallback("glamor_fill()");
|
||||||
|
if (glamor_prepare_access(drawable, GLAMOR_ACCESS_RW)) {
|
||||||
|
if (glamor_prepare_access_gc(gc)) {
|
||||||
|
fbFill(drawable, gc, x, y, width, height);
|
||||||
|
glamor_finish_access_gc(gc);
|
||||||
|
}
|
||||||
|
glamor_finish_access(drawable);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
return;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -142,8 +156,10 @@ glamor_solid(PixmapPtr pixmap, int x, int y, int width, int height,
|
||||||
if (!glamor_set_destination_pixmap(pixmap))
|
if (!glamor_set_destination_pixmap(pixmap))
|
||||||
return;
|
return;
|
||||||
glamor_set_alu(alu);
|
glamor_set_alu(alu);
|
||||||
if (!glamor_set_planemask(pixmap, planemask))
|
if (!glamor_set_planemask(pixmap, planemask)) {
|
||||||
|
ErrorF("Failedto set planemask in glamor_solid.\n");
|
||||||
goto fail;
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
glUseProgramObjectARB(glamor_priv->solid_prog);
|
glUseProgramObjectARB(glamor_priv->solid_prog);
|
||||||
glamor_get_color_4f_from_pixel(pixmap, fg_pixel, color);
|
glamor_get_color_4f_from_pixel(pixmap, fg_pixel, color);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user