[Glamor] [PATCH 33/34] glamor: Don't try to fallback sub-upload to an in-memory pixmap.

Alex Deucher alexdeucher at gmail.com
Fri Feb 28 10:02:28 PST 2014


From: Eric Anholt <eric at anholt.net>

This path needs to draw to the pixmap using its fbo, while an
in-memory pixmap doesn't have one.

Ported from Eric's xserver glamor tree.

Signed-off-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
---
 src/glamor_pixmap.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/glamor_pixmap.c b/src/glamor_pixmap.c
index fc71151..617ed26 100644
--- a/src/glamor_pixmap.c
+++ b/src/glamor_pixmap.c
@@ -831,6 +831,9 @@ ready_to_upload:
 		return TRUE;
 	}
 
+	if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv))
+		return FALSE;
+
 	if (need_flip)
 		ptexcoords = texcoords;
 	else
-- 
1.8.3.1



More information about the Glamor mailing list