glamor: Bail from composite when pixmap cannot be uploaded
authorKeith Packard <keithp@keithp.com>
Wed, 2 Apr 2014 03:54:22 +0000 (20:54 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 3 Apr 2014 20:07:51 +0000 (13:07 -0700)
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@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
glamor/glamor_pixmap.c

index c275af7..a811f60 100644 (file)
@@ -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;