[Spice-devel] [PATCH 2/2] server: remove the no longer used glz drawables list that was maintained for each surface.
Yonit Halperin
yhalperi at redhat.com
Sun Aug 22 23:36:10 PDT 2010
From: Yonit Halperin <yhalperi at yhalperi.tlv.redhat.com>
---
server/red_worker.c | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/server/red_worker.c b/server/red_worker.c
index 0e5565f..d94f3e4 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -594,11 +594,9 @@ typedef struct GlzDrawableInstanceItem {
struct RedGlzDrawable {
RingItem link; // ordered by the time it was encoded
- RingItem surface_link;
RedDrawable *red_drawable;
Drawable *drawable;
uint32_t group_id;
- int32_t surface_id;
SpiceImage *self_bitmap;
GlzDrawableInstanceItem instances_pool[MAX_GLZ_DRAWABLE_INSTANCES];
Ring instances;
@@ -836,7 +834,6 @@ typedef struct RedSurface {
uint32_t refs;
Ring current;
Ring current_list;
- Ring glz_drawables;
#ifdef ACYCLIC_SURFACE_DEBUG
int current_gn;
#endif
@@ -5012,14 +5009,11 @@ static RedGlzDrawable *red_display_get_glz_drawable(DisplayChannel *channel, Dra
ret->red_drawable = drawable->red_drawable;
ret->drawable = drawable;
ret->group_id = drawable->group_id;
- ret->surface_id = drawable->surface_id;
ret->self_bitmap = drawable->self_bitmap;
ret->instances_count = 0;
ring_init(&ret->instances);
ring_item_init(&ret->link);
- ring_item_init(&ret->surface_link);
- ring_add(&surface->glz_drawables, &ret->surface_link);
ring_add_before(&ret->link, &channel->glz_drawables);
drawable->red_glz_drawable = ret;
@@ -5085,7 +5079,6 @@ static void red_display_free_glz_drawable_instance(DisplayChannel *channel,
if (ring_item_is_linked(&glz_drawable->link)) {
ring_remove(&glz_drawable->link);
}
- ring_remove(&glz_drawable->surface_link);
free(glz_drawable);
}
}
@@ -9084,7 +9077,6 @@ static inline void red_create_surface(RedWorker *worker, uint32_t surface_id, ui
ring_init(&surface->current);
ring_init(&surface->current_list);
ring_init(&surface->depend_on_me);
- ring_init(&surface->glz_drawables);
region_init(&surface->draw_dirty_region);
surface->refs = 1;
if (worker->renderer != RED_RENDERER_INVALID) {
--
1.7.1.1
More information about the Spice-devel
mailing list