fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 07:38:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtree: Remove the unused evict hook.

Browse source
This commit is contained in:
Chris Wilson 2010-04-03 15:38:04 +01:00
parent 2a07263373
commit c8fba49603
5 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/cairo-gl-glyphs.c
View file

@ -905,8 +905,7 @@ _cairo_gl_glyph_cache_init (cairo_gl_glyph_cache_t *cache)
GLYPH_CACHE_WIDTH,
GLYPH_CACHE_HEIGHT,
GLYPH_CACHE_MIN_SIZE,
sizeof (cairo_gl_glyph_private_t),
NULL);
sizeof (cairo_gl_glyph_private_t));
}
void

4
src/cairo-rtree-private.h
View file

@ -62,7 +62,6 @@ typedef struct _cairo_rtree_node {
typedef struct _cairo_rtree {
cairo_rtree_node_t root;
int min_size;
void (*evict) (void *node);
cairo_list_t pinned;
cairo_list_t available;
cairo_list_t evictable;
@ -98,8 +97,7 @@ _cairo_rtree_init (cairo_rtree_t *rtree,
int width,
int height,
int min_size,
int node_size,
void (*evict) (void *node));
int node_size);
cairo_private cairo_int_status_t
_cairo_rtree_insert (cairo_rtree_t *rtree,

13
src/cairo-rtree.c
View file

@ -80,8 +80,6 @@ _cairo_rtree_node_destroy (cairo_rtree_t *rtree, cairo_rtree_node_t *node)
if (node->state == CAIRO_RTREE_NODE_OCCUPIED) {
if (node->owner != NULL)
*node->owner = NULL;
if (rtree->evict != NULL)
rtree->evict (node);
} else {
for (i = 0; i < 4 && node->children[i] != NULL; i++)
_cairo_rtree_node_destroy (rtree, node->children[i]);
@ -257,8 +255,6 @@ _cairo_rtree_evict_random (cairo_rtree_t *rtree,
if (node->state == CAIRO_RTREE_NODE_OCCUPIED) {
if (node->owner != NULL)
*node->owner = NULL;
if (rtree->evict != NULL)
rtree->evict (node);
} else {
for (i = 0; i < 4 && node->children[i] != NULL; i++)
_cairo_rtree_node_destroy (rtree, node->children[i]);
@ -331,11 +327,8 @@ _cairo_rtree_init (cairo_rtree_t *rtree,
int width,
int height,
int min_size,
int node_size,
void (*evict) (void *node))
int node_size)
{
rtree->evict = evict;
assert (node_size >= (int) sizeof (cairo_rtree_node_t));
_cairo_freepool_init (&rtree->node_freepool, node_size);
@ -360,8 +353,6 @@ _cairo_rtree_reset (cairo_rtree_t *rtree)
if (rtree->root.state == CAIRO_RTREE_NODE_OCCUPIED) {
if (rtree->root.owner != NULL)
*rtree->root.owner = NULL;
if (rtree->evict != NULL)
rtree->evict (&rtree->root);
} else {
for (i = 0; i < 4 && rtree->root.children[i] != NULL; i++)
_cairo_rtree_node_destroy (rtree, rtree->root.children[i]);
@ -385,8 +376,6 @@ _cairo_rtree_fini (cairo_rtree_t *rtree)
if (rtree->root.state == CAIRO_RTREE_NODE_OCCUPIED) {
if (rtree->root.owner != NULL)
*rtree->root.owner = NULL;
if (rtree->evict != NULL)
rtree->evict (&rtree->root);
} else {
for (i = 0; i < 4 && rtree->root.children[i] != NULL; i++)
_cairo_rtree_node_destroy (rtree, rtree->root.children[i]);

3
src/drm/cairo-drm-i915-surface.c
View file

@ -1784,8 +1784,7 @@ i915_surface_create_from_cacheable_image_internal (i915_device_t *device,
IMAGE_CACHE_WIDTH,
IMAGE_CACHE_HEIGHT,
4,
sizeof (i915_image_private_t),
NULL);
sizeof (i915_image_private_t));
status = _cairo_rtree_insert (&cache->rtree, width, height, &node);
assert (status == CAIRO_STATUS_SUCCESS);

2
src/drm/cairo-drm-intel.c
View file

@ -1133,7 +1133,7 @@ intel_get_glyph_cache (intel_device_t *device,
_cairo_rtree_init (&cache->rtree,
INTEL_GLYPH_CACHE_WIDTH,
INTEL_GLYPH_CACHE_HEIGHT,
0, sizeof (intel_glyph_t), NULL);
0, sizeof (intel_glyph_t));
}
*out = cache;