xserver: Branch 'master'
Michel Dänzer
daenzer at kemper.freedesktop.org
Thu Jun 7 16:34:54 UTC 2018
exa/exa_render.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 3ebef6ab850675e1091df2125ebdfbb147436e6c
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Fri Jun 1 11:57:15 2018 +0200
exa: Use PictureMatchFormat for source-only picture format description
Their pFormat member is NULL, which resulted in a crash in
miRenderColorToPixel.
Fixes: 8171d4c2d67b "render: Store and use all 16bpc of precision for
solid pixels (v2.1)"
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/exa/exa_render.c b/exa/exa_render.c
index 50a9a659e..9fbfdfca2 100644
--- a/exa/exa_render.c
+++ b/exa/exa_render.c
@@ -291,7 +291,8 @@ exaTryDriverSolidFill(PicturePtr pSrc,
pixel = exaGetPixmapFirstPixel(pSrcPix);
}
else
- miRenderColorToPixel(pSrc->pFormat,
+ miRenderColorToPixel(PictureMatchFormat(pDst->pDrawable->pScreen, 32,
+ pSrc->format),
&pSrc->pSourcePict->solidFill.fullcolor,
&pixel);
More information about the xorg-commit
mailing list