diff options
| author | U. Artie Eoff <ullysses.a.eoff@intel.com> | 2014-01-17 13:56:41 -0800 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2014-01-19 22:17:55 -0800 |
| commit | 5e854bcca29d73112edd3036c1fd0aa8a129ed2c (patch) | |
| tree | 20b9d9f0cc309727372e40f25241b62b96e6069d /src/rpi-renderer.c | |
| parent | a62e0e0e02b83d10a2ba1f005ee5bac938f3ea03 (diff) | |
rpi-backend: ensure pixels is destroyed in resource_update
Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
Diffstat (limited to 'src/rpi-renderer.c')
| -rw-r--r-- | src/rpi-renderer.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/rpi-renderer.c b/src/rpi-renderer.c index 5642b4f8..e086a229 100644 --- a/src/rpi-renderer.c +++ b/src/rpi-renderer.c @@ -363,6 +363,7 @@ rpi_resource_update(struct rpi_resource *resource, struct weston_buffer *buffer, int height; int stride; int ret; + int applied_opaque_region = 0; #ifdef HAVE_RESOURCE_WRITE_DATA_RECT int n; #endif @@ -384,13 +385,18 @@ rpi_resource_update(struct rpi_resource *resource, struct weston_buffer *buffer, if (!pixels) return -1; + + applied_opaque_region = 1; } #endif ret = rpi_resource_realloc(resource, ifmt & ~PREMULT_ALPHA_FLAG, width, height, stride, height); - if (ret < 0) + if (ret < 0) { + if (applied_opaque_region) + free(pixels); return -1; + } pixman_region32_init_rect(&write_region, 0, 0, width, height); if (ret == 0) @@ -437,12 +443,8 @@ rpi_resource_update(struct rpi_resource *resource, struct weston_buffer *buffer, pixman_region32_fini(&write_region); -#ifndef HAVE_ELEMENT_SET_OPAQUE_RECT - if (pixman_region32_not_empty(opaque_region) && - wl_shm_buffer_get_format(buffer->shm_buffer) == WL_SHM_FORMAT_ARGB8888 && - resource->enable_opaque_regions) + if (applied_opaque_region) free(pixels); -#endif return ret ? -1 : 0; } |