From b2a6c74c2159c9968c19400d61a11f4773724b4a Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 29 Aug 2012 14:51:40 +0100 Subject: [PATCH] sna: Remove inconsistent assertion As we now may not prefer to use the GPU even if all-damaged and clear, asserting that if we choose to use the CPU if clear is now bogus. Signed-off-by: Chris Wilson --- src/sna/sna_accel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index 9c493c2c..090da91b 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -2379,6 +2379,7 @@ sna_drawable_use_bo(DrawablePtr drawable, unsigned flags, const BoxRec *box, if (priv->gpu_bo && priv->gpu_bo->proxy) { DBG(("%s: cached upload proxy, discard and revert to GPU\n", __FUNCTION__)); + assert(priv->gpu_damage == NULL); kgem_bo_destroy(&to_sna_from_pixmap(pixmap)->kgem, priv->gpu_bo); priv->gpu_bo = NULL; @@ -2548,7 +2549,6 @@ use_gpu_bo: return priv->gpu_bo; use_cpu_bo: - assert(!priv->clear); if (priv->cpu_bo == NULL) return NULL;