summaryrefslogtreecommitdiff
path: root/src/sna/sna_glyphs.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2014-06-13 16:14:43 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2014-06-13 16:53:35 +0100
commit0a0b9dc3538ef731463fb321852b8802cd04e457 (patch)
tree32809b9048773936e08219541bc39a4498d1765a /src/sna/sna_glyphs.c
parentdd87aa8f85c4bafa105fd881a0cce45bda6143df (diff)
sna: Refine decision whether to use the GPU or render inplace
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna_glyphs.c')
-rw-r--r--src/sna/sna_glyphs.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c
index 5d8dd782..e8d92b82 100644
--- a/src/sna/sna_glyphs.c
+++ b/src/sna/sna_glyphs.c
@@ -1948,8 +1948,7 @@ sna_glyphs(CARD8 op,
goto fallback;
}
- if ((too_small(priv) || DAMAGE_IS_ALL(priv->cpu_damage)) &&
- !picture_is_gpu(sna, src, 0)) {
+ if (!is_gpu_dst(priv) && !picture_is_gpu(sna, src, 0)) {
DBG(("%s: fallback -- too small (%dx%d)\n",
__FUNCTION__, dst->pDrawable->width, dst->pDrawable->height));
goto fallback;
@@ -2278,8 +2277,7 @@ sna_glyphs__shared(CARD8 op,
goto fallback;
}
- if ((too_small(priv) || DAMAGE_IS_ALL(priv->cpu_damage)) &&
- !picture_is_gpu(sna, src, 0)) {
+ if (!is_gpu_dst(priv) && !picture_is_gpu(sna, src, 0)) {
DBG(("%s: fallback -- too small (%dx%d)\n",
__FUNCTION__, dst->pDrawable->width, dst->pDrawable->height));
goto fallback;