diff options
| author | marha <marha@users.sourceforge.net> | 2015-06-15 20:27:26 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-06-15 20:27:26 +0200 |
| commit | e8d5e7c4bb11f7fcb0a4ba5c13f43e7929849a2f (patch) | |
| tree | a88d66b3d34f8e008f08e2bd77889c6c6718ab11 /xorg-server/glamor/glamor_largepixmap.c | |
| parent | 0b3be550b20ad9f991f77bf979b2c306a7d4ef11 (diff) | |
| download | vcxsrv-e8d5e7c4bb11f7fcb0a4ba5c13f43e7929849a2f.tar.gz vcxsrv-e8d5e7c4bb11f7fcb0a4ba5c13f43e7929849a2f.tar.bz2 vcxsrv-e8d5e7c4bb11f7fcb0a4ba5c13f43e7929849a2f.zip | |
fontconfig libX11 libxcb xcb-proto mesa pixman xserver xkeyboard-config git update 15 June 2015release/external
xserver commit fa12f2c150b2f50de9dac4a2b09265f13af353af
libxcb commit f85661c3bca97faa72431df92a3867be39a74e23
libxcb/xcb-proto commit fef8a4cdc2cacd9541a656026371a3d338dadb8e
xkeyboard-config commit 61fb58a95a071cc1c212f6d3808908c086219fe0
libX11 commit f0286b2770ece10aef5e2e8c004260217f12fd25
pixman commit eebc1b78200aff075dbcae9c8d00edad1f830d91
fontconfig commit f6d61c9beed856a925bd60c025b55284b2d88161
mesa commit 932d1613d1e15ec22555e5ec09105c49eb850e36
Diffstat (limited to 'xorg-server/glamor/glamor_largepixmap.c')
| -rw-r--r-- | xorg-server/glamor/glamor_largepixmap.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/xorg-server/glamor/glamor_largepixmap.c b/xorg-server/glamor/glamor_largepixmap.c index 391f376e9..da3fb6150 100644 --- a/xorg-server/glamor/glamor_largepixmap.c +++ b/xorg-server/glamor/glamor_largepixmap.c @@ -1055,6 +1055,15 @@ glamor_composite_largepixmap_region(CARD8 op, int source_repeat_type = 0, mask_repeat_type = 0; int ok = TRUE; + if (source_pixmap == dest_pixmap) { + glamor_fallback("source and dest pixmaps are the same\n"); + return FALSE; + } + if (mask_pixmap == dest_pixmap) { + glamor_fallback("mask and dest pixmaps are the same\n"); + return FALSE; + } + if (source->repeat) source_repeat_type = source->repeatType; else |