[PATCH 8/8] glamor: Bail from composite when pixmap cannot be uploaded

Keith Packard keithp at keithp.com
Tue Apr 1 20:54:22 PDT 2014


I think the sense of the return value was just flipped here; if you
return TRUE, then the calling code assumes that the pixmap *has* been
uploaded and that an FBO is available. When it tries to use it, it
crashes though. Returning false makes the caller bail back to software.

Signed-off-by: Keith Packard <keithp at keithp.com>
---
 glamor/glamor_pixmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c
index c275af7..a811f60 100644
--- a/glamor/glamor_pixmap.c
+++ b/glamor/glamor_pixmap.c
@@ -978,7 +978,7 @@ glamor_upload_sub_pixmap_to_texture(PixmapPtr pixmap, int x, int y, int w,
                                                &no_alpha,
                                                &revert, &swap_rb, 1)) {
         glamor_fallback("Unknown pixmap depth %d.\n", pixmap->drawable.depth);
-        return TRUE;
+        return FALSE;
     }
     if (glamor_pixmap_upload_prepare(pixmap, format, no_alpha, revert, swap_rb))
         return FALSE;
-- 
1.9.0



More information about the xorg-devel mailing list