From 566cca59e14b223b8dcd045ccc2bbcf08d05b297 Mon Sep 17 00:00:00 2001 From: Zhigang Gong Date: Sun, 29 Jan 2012 14:14:36 +0800 Subject: [PATCH] glamor-gles2: Fixup the pixmap before read back if it is not readable. Signed-off-by: Zhigang Gong --- glamor/glamor_getspans.c | 2 +- glamor/glamor_pixmap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/glamor/glamor_getspans.c b/glamor/glamor_getspans.c index 92c278fe5..6c50d1b5b 100644 --- a/glamor/glamor_getspans.c +++ b/glamor/glamor_getspans.c @@ -67,7 +67,7 @@ _glamor_get_spans(DrawablePtr drawable, glamor_validate_pixmap(pixmap); if (glamor_priv->gl_flavor == GLAMOR_GL_ES2 - && (glamor_tex_format_is_readable(format) || !no_revert)) { + && (!glamor_tex_format_is_readable(format) || !no_revert)) { /* XXX prepare whole pixmap is not efficient. */ temp_pixmap = diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c index 1c810b750..e1542732b 100644 --- a/glamor/glamor_pixmap.c +++ b/glamor/glamor_pixmap.c @@ -685,7 +685,7 @@ glamor_download_pixmap_to_cpu(PixmapPtr pixmap, glamor_access_t access) glamor_validate_pixmap(pixmap); if (glamor_priv->gl_flavor == GLAMOR_GL_ES2 - && (glamor_tex_format_is_readable(format) || !no_revert)) { + && (!glamor_tex_format_is_readable(format) || !no_revert)) { temp_pixmap = glamor_es2_pixmap_read_prepare(pixmap, &format, &type, no_alpha,