frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor: handle NULL source picture 

COMPOSITE_REGION() can pass NULL as a source picture, make sure we
handle that nicely in both glamor_composite_clipped_region() and
glamor_composite_choose_shader().

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=101894
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Olivier Fourdan 2017-07-26 16:00:37 +02:00 committed by Adam Jackson
parent 4486d199bd
commit bd353e9b84
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glamor/glamor_render.c
View File

@ -992,7 +992,7 @@ glamor_composite_choose_shader(CARD8 op,
goto fail; goto fail;
} }
} else { } else {
if (!glamor_render_format_is_supported(source->format)) { if (source && !glamor_render_format_is_supported(source->format)) {
glamor_fallback("Unsupported source picture format.\n"); glamor_fallback("Unsupported source picture format.\n");
goto fail; goto fail;
} }
@ -1436,7 +1436,8 @@ glamor_composite_clipped_region(CARD8 op,
x_source, y_source, x_mask, y_mask, x_dest, y_dest, width, height); x_source, y_source, x_mask, y_mask, x_dest, y_dest, width, height);
/* Is the composite operation equivalent to a copy? */ /* Is the composite operation equivalent to a copy? */
if (!mask && !source->alphaMap && !dest->alphaMap if (source &&
!mask && !source->alphaMap && !dest->alphaMap
&& source->pDrawable && !source->transform && source->pDrawable && !source->transform
/* CopyArea is only defined with matching depths. */ /* CopyArea is only defined with matching depths. */
&& dest->pDrawable->depth == source->pDrawable->depth && dest->pDrawable->depth == source->pDrawable->depth