From 510c8605641803f1f5b5d2de6d3bb422b148e0e7 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 21 Jan 2016 11:30:15 -0800 Subject: [PATCH] glamor: Fix copy-like Render operations between 15 and 16 depth. Reading and writing to 16-depth pixmaps using PICT_x1r5g5b5 ends up failing, unless you're doing a straight copy at the same bpp where the misinterpretation matches on both sides. Fixes rendercheck/blend/over and renderhceck/blend/src in piglit. Please cherry-pick this to active stable branches. Signed-off-by: Eric Anholt Reviewed-by: Dave Airlie --- glamor/glamor_render.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index d8574ece6..92b6b0cd0 100644 --- a/glamor/glamor_render.c +++ b/glamor/glamor_render.c @@ -512,6 +512,14 @@ static int compatible_formats(CARD8 op, PicturePtr dst, PicturePtr src) { if (op == PictOpSrc) { + /* We can't do direct copies between different depths at 16bpp + * because r,g,b are allocated to different bits. + */ + if (dst->pDrawable->bitsPerPixel == 16 && + dst->pDrawable->depth != src->pDrawable->depth) { + return 0; + } + if (src->format == dst->format) return 1;