Commit fd16555c authored by Michel Dänzer's avatar Michel Dänzer Committed by Keith Packard

Revert "glamor: Fix coordinates handling for composite source/mask pictures"

This reverts commit 4e9aabb6.

It broke kwin decorations with XRender compositing.
Signed-off-by: Michel Dänzer's avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Eric Anholt's avatarEric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard's avatarKeith Packard <keithp@keithp.com>
parent 18744907
...@@ -1450,8 +1450,8 @@ glamor_composite_clipped_region(CARD8 op, ...@@ -1450,8 +1450,8 @@ glamor_composite_clipped_region(CARD8 op,
|| source_pixmap->drawable.height != height)))) { || source_pixmap->drawable.height != height)))) {
temp_src = temp_src =
glamor_convert_gradient_picture(screen, source, glamor_convert_gradient_picture(screen, source,
x_source, extent->x1 + x_source - x_dest,
y_source, extent->y1 + y_source - y_dest,
width, height); width, height);
if (!temp_src) { if (!temp_src) {
temp_src = source; temp_src = source;
...@@ -1459,8 +1459,8 @@ glamor_composite_clipped_region(CARD8 op, ...@@ -1459,8 +1459,8 @@ glamor_composite_clipped_region(CARD8 op,
} }
temp_src_priv = temp_src_priv =
glamor_get_pixmap_private((PixmapPtr) (temp_src->pDrawable)); glamor_get_pixmap_private((PixmapPtr) (temp_src->pDrawable));
x_temp_src = 0; x_temp_src = -extent->x1 + x_dest;
y_temp_src = 0; y_temp_src = -extent->y1 + y_dest;
} }
if (mask if (mask
...@@ -1474,8 +1474,8 @@ glamor_composite_clipped_region(CARD8 op, ...@@ -1474,8 +1474,8 @@ glamor_composite_clipped_region(CARD8 op,
* to do reduce one convertion. */ * to do reduce one convertion. */
temp_mask = temp_mask =
glamor_convert_gradient_picture(screen, mask, glamor_convert_gradient_picture(screen, mask,
x_mask, extent->x1 + x_mask - x_dest,
y_mask, extent->y1 + y_mask - y_dest,
width, height); width, height);
if (!temp_mask) { if (!temp_mask) {
temp_mask = mask; temp_mask = mask;
...@@ -1483,8 +1483,8 @@ glamor_composite_clipped_region(CARD8 op, ...@@ -1483,8 +1483,8 @@ glamor_composite_clipped_region(CARD8 op,
} }
temp_mask_priv = temp_mask_priv =
glamor_get_pixmap_private((PixmapPtr) (temp_mask->pDrawable)); glamor_get_pixmap_private((PixmapPtr) (temp_mask->pDrawable));
x_temp_mask = 0; x_temp_mask = -extent->x1 + x_dest;
y_temp_mask = 0; y_temp_mask = -extent->y1 + y_dest;
} }
/* Do two-pass PictOpOver componentAlpha, until we enable /* Do two-pass PictOpOver componentAlpha, until we enable
* dual source color blending. * dual source color blending.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment