diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-10-04 14:35:14 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-10-04 14:35:14 +0100 |
| commit | acf354d7fb575c468e86a5935cad095015ccadb1 (patch) | |
| tree | ca25c3d378586b800fd08e21fb9410638e6289b8 /src | |
| parent | c7ad655359b746917deeac3efb9eb843465cf4b9 (diff) | |
sna: Propagate failures from compositing glyph masks
So that we can fallback correctly. This is primarily using for debugging
failure paths...
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sna/sna_glyphs.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c index 53494e38..9a6ad4b5 100644 --- a/src/sna/sna_glyphs.c +++ b/src/sna/sna_glyphs.c @@ -819,6 +819,7 @@ glyphs_via_mask(struct sna *sna, PicturePtr glyph_atlas, mask; int16_t x, y, width, height; int error; + bool ret = false; BoxRec box; if (NO_GLYPHS_VIA_MASK) @@ -1141,11 +1142,12 @@ next_glyph: 0, 0, box.x1, box.y1, width, height); + ret = true; err_mask: FreePicture(mask, 0); err_pixmap: sna_pixmap_destroy(pixmap); - return TRUE; + return ret; } static PictFormatPtr @@ -1716,6 +1718,7 @@ glyphs_via_image(struct sna *sna, int16_t x, y, width, height; pixman_image_t *mask_image; int error; + bool ret = false; BoxRec box; if (NO_GLYPHS_VIA_MASK) @@ -1929,9 +1932,10 @@ next_image: box.x1, box.y1, width, height); FreePicture(mask, 0); + ret = true; err_pixmap: sna_pixmap_destroy(pixmap); - return TRUE; + return ret; } void |