diff options
author | Alon Levy <alevy@redhat.com> | 2012-05-15 12:35:40 +0300 |
---|---|---|
committer | Alon Levy <alevy@redhat.com> | 2012-05-15 19:24:41 +0300 |
commit | 7c258a992fd175c95f774e9c021da5a00c53a690 (patch) | |
tree | d8f614ebc59f08787addc0ae5c2abac31797c0a2 /server/red_worker.c | |
parent | 67cbdccccfb1e0e85e7feefc808ee1d7b67da76d (diff) | |
download | spice-7c258a992fd175c95f774e9c021da5a00c53a690.tar.gz spice-7c258a992fd175c95f774e9c021da5a00c53a690.tar.xz spice-7c258a992fd175c95f774e9c021da5a00c53a690.zip |
server/red_worker: rename SpiceImage *self_bitmap to self_bitmap_image
(cherry picked from commit 96bfcea9659cebb5b121d1472bde045add3ee491)
Conflicts:
server/red_worker.c
s/ASSERT/spice_assert/
Diffstat (limited to 'server/red_worker.c')
-rw-r--r-- | server/red_worker.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/server/red_worker.c b/server/red_worker.c index b48ad5dd..cdad131b 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -556,7 +556,7 @@ struct RedGlzDrawable { RedDrawable *red_drawable; Drawable *drawable; uint32_t group_id; - SpiceImage *self_bitmap; + SpiceImage *self_bitmap_image; GlzDrawableInstanceItem instances_pool[MAX_GLZ_DRAWABLE_INSTANCES]; Ring instances; uint8_t instances_count; @@ -789,7 +789,7 @@ struct Drawable { int streamable; BitmapGradualType copy_bitmap_graduality; uint32_t group_id; - SpiceImage *self_bitmap; + SpiceImage *self_bitmap_image; DependItem depend_items[3]; uint8_t *backed_surface_data; @@ -1676,15 +1676,15 @@ static RedDrawable *ref_red_drawable(RedDrawable *drawable) static inline void put_red_drawable(RedWorker *worker, RedDrawable *drawable, uint32_t group_id, - SpiceImage *self_bitmap) + SpiceImage *self_bitmap_image) { QXLReleaseInfoExt release_info_ext; if (--drawable->refs) { return; } - if (self_bitmap) { - red_put_image(self_bitmap); + if (self_bitmap_image) { + red_put_image(self_bitmap_image); } worker->red_drawable_count--; release_info_ext.group_id = group_id; @@ -1748,7 +1748,7 @@ static inline void release_drawable(RedWorker *worker, Drawable *drawable) ring_remove(item); } put_red_drawable(worker, drawable->red_drawable, - drawable->group_id, drawable->self_bitmap); + drawable->group_id, drawable->self_bitmap_image); free_drawable(worker, drawable); worker->drawable_count--; } @@ -3607,7 +3607,7 @@ static inline int red_handle_self_bitmap(RedWorker *worker, Drawable *drawable) } } - drawable->self_bitmap = image; + drawable->self_bitmap_image = image; return TRUE; } @@ -4029,8 +4029,8 @@ static void localize_bitmap(RedWorker *worker, SpiceImage **image_ptr, SpiceImag if (image == NULL) { ASSERT(drawable != NULL); - ASSERT(drawable->self_bitmap != NULL); - *image_ptr = drawable->self_bitmap; + ASSERT(drawable->self_bitmap_image != NULL); + *image_ptr = drawable->self_bitmap_image; return; } @@ -5075,7 +5075,7 @@ static RedGlzDrawable *red_display_get_glz_drawable(DisplayChannelClient *dcc, D ret->red_drawable = ref_red_drawable(drawable->red_drawable); ret->drawable = drawable; ret->group_id = drawable->group_id; - ret->self_bitmap = drawable->self_bitmap; + ret->self_bitmap_image = drawable->self_bitmap_image; ret->instances_count = 0; ring_init(&ret->instances); @@ -5142,7 +5142,7 @@ static void red_display_free_glz_drawable_instance(DisplayChannelClient *dcc, ring_remove(&glz_drawable->drawable_link); } put_red_drawable(worker, glz_drawable->red_drawable, - glz_drawable->group_id, glz_drawable->self_bitmap); + glz_drawable->group_id, glz_drawable->self_bitmap_image); worker->glz_drawable_count--; if (ring_item_is_linked(&glz_drawable->link)) { ring_remove(&glz_drawable->link); @@ -6296,8 +6296,8 @@ static FillBitsType fill_bits(DisplayChannelClient *dcc, SpiceMarshaller *m, SpiceMarshaller *bitmap_palette_out, *lzplt_palette_out; if (simage == NULL) { - ASSERT(drawable->self_bitmap); - simage = drawable->self_bitmap; + ASSERT(drawable->self_bitmap_image); + simage = drawable->self_bitmap_image; } image.descriptor = simage->descriptor; |