-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This is initially based around the requirements for handling internal fallbacks to the image compositor and reducing the number of pixels required to be transferred. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
- Loading branch information
Chris Wilson
committed
Feb 15, 2012
1 parent
c7d8ec7
commit 8bea52b
Showing
10 changed files
with
379 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /* cairo - a vector graphics library with display and print output | ||
| * | ||
| * Copyright © 2012 Intel Corporation | ||
| * | ||
| * This library is free software; you can redistribute it and/or | ||
| * modify it either under the terms of the GNU Lesser General Public | ||
| * License version 2.1 as published by the Free Software Foundation | ||
| * (the "LGPL") or, at your option, under the terms of the Mozilla | ||
| * Public License Version 1.1 (the "MPL"). If you do not alter this | ||
| * notice, a recipient may use your version of this file under either | ||
| * the MPL or the LGPL. | ||
| * | ||
| * You should have received a copy of the LGPL along with this library | ||
| * in the file COPYING-LGPL-2.1; if not, write to the Free Software | ||
| * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| * You should have received a copy of the MPL along with this library | ||
| * in the file COPYING-MPL-1.1 | ||
| * | ||
| * The contents of this file are subject to the Mozilla Public License | ||
| * Version 1.1 (the "License"); you may not use this file except in | ||
| * compliance with the License. You may obtain a copy of the License at | ||
| * http://www.mozilla.org/MPL/ | ||
| * | ||
| * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY | ||
| * OF ANY KIND, either express or implied. See the LGPL or the MPL for | ||
| * the specific language governing rights and limitations. | ||
| * | ||
| * The Original Code is the cairo graphics library. | ||
| * | ||
| * The Initial Developer of the Original Code is Chris Wilson | ||
| * | ||
| * Contributor(s): | ||
| * Chris Wilson <chris@chris-wilson.co.uk> | ||
| */ | ||
|
|
||
| #ifndef CAIRO_DAMAGE_PRIVATE_H | ||
| #define CAIRO_DAMAGE_PRIVATE_H | ||
|
|
||
| #include "cairo-types-private.h" | ||
|
|
||
| #include <pixman.h> | ||
|
|
||
| CAIRO_BEGIN_DECLS | ||
|
|
||
| struct _cairo_damage { | ||
| cairo_status_t status; | ||
| cairo_region_t *region; | ||
|
|
||
| int dirty, remain; | ||
| struct _cairo_damage_chunk { | ||
| struct _cairo_damage_chunk *next; | ||
| cairo_box_t *base; | ||
| int count; | ||
| int size; | ||
| } chunks, *tail; | ||
| cairo_box_t boxes[32]; | ||
| }; | ||
|
|
||
| cairo_private cairo_damage_t * | ||
| _cairo_damage_create (void); | ||
|
|
||
| cairo_private cairo_damage_t * | ||
| _cairo_damage_add_box (cairo_damage_t *damage, | ||
| const cairo_box_t *box); | ||
|
|
||
| cairo_private cairo_damage_t * | ||
| _cairo_damage_add_rectangle (cairo_damage_t *damage, | ||
| const cairo_rectangle_int_t *rect); | ||
|
|
||
| cairo_private cairo_damage_t * | ||
| _cairo_damage_add_region (cairo_damage_t *damage, | ||
| const cairo_region_t *region); | ||
|
|
||
| cairo_private cairo_damage_t * | ||
| _cairo_damage_reduce (cairo_damage_t *damage); | ||
|
|
||
| cairo_private void | ||
| _cairo_damage_destroy (cairo_damage_t *damage); | ||
|
|
||
| CAIRO_END_DECLS | ||
|
|
||
| #endif /* CAIRO_DAMAGE_PRIVATE_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,214 @@ | ||
| /* | ||
| * Copyright © 2012 Intel Corporation | ||
| * | ||
| * This library is free software; you can redistribute it and/or | ||
| * modify it either under the terms of the GNU Lesser General Public | ||
| * License version 2.1 as published by the Free Software Foundation | ||
| * (the "LGPL") or, at your option, under the terms of the Mozilla | ||
| * Public License Version 1.1 (the "MPL"). If you do not alter this | ||
| * notice, a recipient may use your version of this file under either | ||
| * the MPL or the LGPL. | ||
| * | ||
| * You should have received a copy of the LGPL along with this library | ||
| * in the file COPYING-LGPL-2.1; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA | ||
| * You should have received a copy of the MPL along with this library | ||
| * in the file COPYING-MPL-1.1 | ||
| * | ||
| * The contents of this file are subject to the Mozilla Public License | ||
| * Version 1.1 (the "License"); you may not use this file except in | ||
| * compliance with the License. You may obtain a copy of the License at | ||
| * http://www.mozilla.org/MPL/ | ||
| * | ||
| * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY | ||
| * OF ANY KIND, either express or implied. See the LGPL or the MPL for | ||
| * the specific language governing rights and limitations. | ||
| * | ||
| * The Original Code is the cairo graphics library. | ||
| * | ||
| * The Initial Developer of the Original Code is Chris Wilson | ||
| * | ||
| * Contributor(s): | ||
| * Chris Wilson <chris@chris-wilson.co.uk> | ||
| */ | ||
|
|
||
| #include "cairoint.h" | ||
|
|
||
| #include "cairo-damage-private.h" | ||
| #include "cairo-region-private.h" | ||
|
|
||
| static const cairo_damage_t __cairo_damage__nil = { CAIRO_STATUS_NO_MEMORY }; | ||
|
|
||
| cairo_damage_t * | ||
| _cairo_damage_create (void) | ||
| { | ||
| cairo_damage_t *damage; | ||
|
|
||
| damage = malloc (sizeof (*damage)); | ||
| if (unlikely (damage == NULL)) { | ||
| _cairo_error_throw(CAIRO_STATUS_NO_MEMORY); | ||
| return (cairo_damage_t *) &__cairo_damage__nil; | ||
| } | ||
|
|
||
| damage->status = CAIRO_STATUS_SUCCESS; | ||
| damage->region = NULL; | ||
| damage->dirty = 0; | ||
| damage->tail = &damage->chunks; | ||
| damage->chunks.base = damage->boxes; | ||
| damage->chunks.size = ARRAY_LENGTH(damage->boxes); | ||
| damage->chunks.count = 0; | ||
| damage->chunks.next = NULL; | ||
|
|
||
| damage->remain = damage->chunks.size; | ||
|
|
||
| return damage; | ||
| } | ||
|
|
||
| void | ||
| _cairo_damage_destroy (cairo_damage_t *damage) | ||
| { | ||
| struct _cairo_damage_chunk *chunk, *next; | ||
|
|
||
| for (chunk = damage->chunks.next; chunk != NULL; chunk = next) { | ||
| next = chunk->next; | ||
| free (chunk); | ||
| } | ||
| cairo_region_destroy (damage->region); | ||
| free (damage); | ||
| } | ||
|
|
||
| static cairo_damage_t * | ||
| _cairo_damage_add_boxes(cairo_damage_t *damage, | ||
| const cairo_box_t *boxes, | ||
| int count) | ||
| { | ||
| struct _cairo_damage_chunk *chunk; | ||
| int n, size; | ||
|
|
||
| if (damage == NULL) | ||
| damage = _cairo_damage_create (); | ||
|
|
||
| damage->dirty += count; | ||
|
|
||
| n = count; | ||
| if (n > damage->remain) | ||
| n = damage->remain; | ||
|
|
||
| memcpy (damage->tail->base + damage->tail->count, boxes, n); | ||
|
|
||
| count -= n; | ||
| damage->tail->count += n; | ||
| damage->remain -= n; | ||
|
|
||
| if (count == 0) | ||
| return damage; | ||
|
|
||
| size = 2 * damage->tail->size; | ||
| if (size < count) | ||
| size = (count + 64) & ~63; | ||
|
|
||
| chunk = malloc (sizeof (*chunk) + sizeof (cairo_box_t) * size); | ||
| if (unlikely (chunk == NULL)) { | ||
| _cairo_damage_destroy (damage); | ||
| return (cairo_damage_t *) &__cairo_damage__nil; | ||
| } | ||
|
|
||
| chunk->next = NULL; | ||
| chunk->base = (cairo_box_t *) (chunk + 1); | ||
| chunk->size = size; | ||
| chunk->count = count; | ||
|
|
||
| damage->tail->next = chunk; | ||
| damage->remain = size - count; | ||
|
|
||
| memcpy (damage->tail->base, boxes + n, count); | ||
|
|
||
| return damage; | ||
| } | ||
|
|
||
| cairo_damage_t * | ||
| _cairo_damage_add_box(cairo_damage_t *damage, | ||
| const cairo_box_t *box) | ||
| { | ||
| return _cairo_damage_add_boxes(damage, box, 1); | ||
| } | ||
|
|
||
| cairo_damage_t * | ||
| _cairo_damage_add_rectangle(cairo_damage_t *damage, | ||
| const cairo_rectangle_int_t *r) | ||
| { | ||
| cairo_box_t box; | ||
|
|
||
| box.p1.x = r->x; | ||
| box.p1.y = r->y; | ||
| box.p2.x = r->x + r->width; | ||
| box.p2.y = r->y + r->height; | ||
|
|
||
| return _cairo_damage_add_boxes(damage, &box, 1); | ||
| } | ||
|
|
||
| cairo_damage_t * | ||
| _cairo_damage_add_region (cairo_damage_t *damage, | ||
| const cairo_region_t *region) | ||
| { | ||
| cairo_box_t *boxes; | ||
| int nbox; | ||
|
|
||
| boxes = _cairo_region_get_boxes (region, &nbox); | ||
| return _cairo_damage_add_boxes(damage, boxes, nbox); | ||
| } | ||
|
|
||
| cairo_damage_t * | ||
| _cairo_damage_reduce (cairo_damage_t *damage) | ||
| { | ||
| cairo_box_t *free_boxes = NULL; | ||
| cairo_box_t *boxes, *b; | ||
| struct _cairo_damage_chunk *chunk, *last; | ||
|
|
||
| if (damage == NULL || !damage->dirty) | ||
| return damage; | ||
|
|
||
| if (damage->region) { | ||
| cairo_region_t *region; | ||
|
|
||
| region = damage->region; | ||
| damage->region = NULL; | ||
|
|
||
| damage = _cairo_damage_add_region (damage, region); | ||
| cairo_region_destroy (region); | ||
|
|
||
| if (unlikely (damage->status)) | ||
| return damage; | ||
| } | ||
|
|
||
| boxes = damage->tail->base; | ||
| if (damage->dirty > damage->tail->size) { | ||
| boxes = free_boxes = malloc (damage->dirty * sizeof (cairo_box_t)); | ||
| if (unlikely (boxes == NULL)) { | ||
| _cairo_damage_destroy (damage); | ||
| return (cairo_damage_t *) &__cairo_damage__nil; | ||
| } | ||
|
|
||
| b = boxes; | ||
| last = NULL; | ||
| } else { | ||
| b = boxes + damage->tail->count; | ||
| last = damage->tail; | ||
| } | ||
|
|
||
| for (chunk = &damage->chunks; chunk != last; chunk = chunk->next) { | ||
| memcpy (b, chunk->base, chunk->count * sizeof (cairo_box_t)); | ||
| b += chunk->count; | ||
| } | ||
|
|
||
| damage->region = _cairo_region_create_from_boxes (boxes, damage->dirty); | ||
| free (free_boxes); | ||
|
|
||
| if (unlikely (damage->region->status)) { | ||
| _cairo_damage_destroy (damage); | ||
| return (cairo_damage_t *) &__cairo_damage__nil; | ||
| } | ||
|
|
||
| damage->dirty = 0; | ||
| return damage; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.