mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix on-the-fly transparency changes in pixman-renderer

Browse Source 
This fixes :
- leaking the mask used to simulate transparency ;
- code style (definitions moved up, use of brackets) ;
- applying an opaque region when transparency is
 wanted (shound not happen).

Signed-off-by: Manuel Bachmann <manuel.bachmann@open.eurogiciel.org>
This commit is contained in:
Manuel Bachmann
2014-04-07 11:58:45 +02:00
committed by Kristian Høgsberg
parent 4d085e709d
commit 9c4ab6612f
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pixman-renderer.c
+11 -5
View File
@@ -181,6 +181,8 @@ repaint_region(struct weston_view *ev, struct weston_output *output,
float view_x, view_y; float view_x, view_y;
pixman_transform_t transform; pixman_transform_t transform;
pixman_fixed_t fw, fh; pixman_fixed_t fw, fh;
pixman_image_t *mask_image;
pixman_color_t mask = { 0, };
/* The final region to be painted is the intersection of /* The final region to be painted is the intersection of
* 'region' and 'surf_region'. However, 'region' is in the global * 'region' and 'surf_region'. However, 'region' is in the global
@@ -340,12 +342,12 @@ repaint_region(struct weston_view *ev, struct weston_output *output,
if (ps->buffer_ref.buffer) if (ps->buffer_ref.buffer)
wl_shm_buffer_begin_access(ps->buffer_ref.buffer->shm_buffer); wl_shm_buffer_begin_access(ps->buffer_ref.buffer->shm_buffer);
pixman_image_t *mask_image;
if (ev->alpha < 1.0) { if (ev->alpha < 1.0) {
pixman_color_t mask = { 0x0000, 0x0000, 0x0000, 0xffff*ev->alpha }; mask.alpha = 0xffff * ev->alpha;
mask_image = pixman_image_create_solid_fill(&mask); mask_image = pixman_image_create_solid_fill(&mask);
} else } else {
mask_image = NULL; mask_image = NULL;
}
pixman_image_composite32(pixman_op, pixman_image_composite32(pixman_op,
ps->image, /* src */ ps->image, /* src */
@@ -357,6 +359,9 @@ repaint_region(struct weston_view *ev, struct weston_output *output,
pixman_image_get_width (po->shadow_image), /* width */ pixman_image_get_width (po->shadow_image), /* width */
pixman_image_get_height (po->shadow_image) /* height */); pixman_image_get_height (po->shadow_image) /* height */);
if (mask_image)
pixman_image_unref(mask_image);
if (ps->buffer_ref.buffer) if (ps->buffer_ref.buffer)
wl_shm_buffer_end_access(ps->buffer_ref.buffer->shm_buffer); wl_shm_buffer_end_access(ps->buffer_ref.buffer->shm_buffer);
@@ -404,8 +409,9 @@ draw_view(struct weston_view *ev, struct weston_output *output,
} }
/* TODO: Implement repaint_region_complex() using pixman_composite_trapezoids() */ /* TODO: Implement repaint_region_complex() using pixman_composite_trapezoids() */
if (ev->transform.enabled && if (ev->alpha != 1.0 ||
ev->transform.matrix.type != WESTON_MATRIX_TRANSFORM_TRANSLATE) { (ev->transform.enabled &&
ev->transform.matrix.type != WESTON_MATRIX_TRANSFORM_TRANSLATE)) {
repaint_region(ev, output, &repaint, NULL, PIXMAN_OP_OVER); repaint_region(ev, output, &repaint, NULL, PIXMAN_OP_OVER);
} else { } else {
/* blended region is whole surface minus opaque region: */ /* blended region is whole surface minus opaque region: */