From a3e681eafa5355b8bb3b099d47983f14f0d5e197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Tue, 23 Feb 2016 17:19:03 +0900 Subject: [PATCH] glamor: Source pictures are always depth 32 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We were using the destination pixmap depth to determine the source picture format. Fixes incorrect text rendering with some MATE desktop GTK3 themes. Reviewed-by: Adam Jackson Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94246 Signed-off-by: Michel Dänzer --- glamor/glamor_program.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/glamor/glamor_program.c b/glamor/glamor_program.c index ddab16f05..0a94de62f 100644 --- a/glamor/glamor_program.c +++ b/glamor/glamor_program.c @@ -508,9 +508,9 @@ use_source_solid(CARD8 op, PicturePtr src, PicturePtr dst, glamor_program *prog) glamor_set_blend(op, prog->alpha, dst); - glamor_set_color(glamor_get_drawable_pixmap(dst->pDrawable), - src->pSourcePict->solidFill.color, - prog->fg_uniform); + glamor_set_color_depth(dst->pDrawable->pScreen, 32, + src->pSourcePict->solidFill.color, + prog->fg_uniform); return TRUE; }