pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2025-12-25 22:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pass surface directly in is_primary_surface

Browse Source 
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Victor Toso <victortoso@redhat.com>
This commit is contained in:
Frediano Ziglio 2016-09-27 22:24:29 +01:00 committed by Frediano Ziglio
parent f418bbb522
commit 493077d080
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/dcc.cpp
View File

@ -171,7 +171,7 @@ void dcc_create_surface(DisplayChannelClient *dcc, int surface_id)
}
display = DCC_TO_DC(dcc);
flags = is_primary_surface(display, surface_id) ? SPICE_SURFACE_FLAGS_PRIMARY : 0;
flags = is_primary_surface_id(display, surface_id) ? SPICE_SURFACE_FLAGS_PRIMARY : 0;
/* don't send redundant create surface commands to client */
if (display->get_during_target_migrate() ||
@ -226,7 +226,7 @@ dcc_add_surface_area_image(DisplayChannelClient *dcc, int surface_id,
/* For 32bit non-primary surfaces we need to keep any non-zero
high bytes as the surface may be used as source to an alpha_blend */
if (!is_primary_surface(display, surface_id) &&
if (!is_primary_surface(display, surface) &&
item->image_format == SPICE_BITMAP_FMT_32BIT &&
rgb32_data_has_alpha(item->width, item->height, item->stride, item->data, &all_set)) {
if (all_set) {

12
server/display-channel-private.h
View File

@ -336,12 +336,14 @@ static inline int has_shadow(RedDrawable *drawable)
return drawable->type == QXL_COPY_BITS;
}
static inline int is_primary_surface(DisplayChannel *display, uint32_t surface_id)
static inline bool is_primary_surface_id(DisplayChannel *display, uint32_t surface_id)
{
if (surface_id == 0) {
return TRUE;
}
return FALSE;
return surface_id == 0;
}
static inline bool is_primary_surface(DisplayChannel *display, const RedSurface *surface)
{
return surface->id == 0;
}
static inline void region_add_clip_rects(QRegion *rgn, SpiceClipRects *data)

14
server/display-channel.cpp
View File

@ -234,7 +234,7 @@ static void display_channel_surface_unref(DisplayChannel *display, RedSurface *s
}
// only primary surface streams are supported
if (is_primary_surface(display, surface->id)) {
if (is_primary_surface(display, surface)) {
stop_streams(display);
}
spice_assert(surface->context.canvas);
@ -274,7 +274,7 @@ static void streams_update_visible_region(DisplayChannel *display, Drawable *dra
return;
}
if (!is_primary_surface(display, drawable->surface->id)) {
if (!is_primary_surface(display, drawable->surface)) {
return;
}
@ -817,7 +817,7 @@ static bool current_add_with_shadow(DisplayChannel *display, Ring *ring, Drawabl
// for now putting them on root.
// only primary surface streams are supported
if (is_primary_surface(display, item->surface->id)) {
if (is_primary_surface(display, item->surface)) {
video_stream_detach_behind(display, &shadow->base.rgn, nullptr);
}
@ -838,7 +838,7 @@ static bool current_add_with_shadow(DisplayChannel *display, Ring *ring, Drawabl
region_destroy(&exclude_rgn);
streams_update_visible_region(display, item);
} else {
if (is_primary_surface(display, item->surface->id)) {
if (is_primary_surface(display, item->surface)) {
video_stream_detach_behind(display, &item->tree_item.base.rgn, item);
}
}
@ -1035,7 +1035,7 @@ static bool current_add(DisplayChannel *display, Ring *ring, Drawable *drawable)
* video_stream_detach_behind
*/
current_add_drawable(display, drawable, ring);
if (is_primary_surface(display, drawable->surface->id)) {
if (is_primary_surface(display, drawable->surface)) {
video_stream_detach_behind(display, &drawable->tree_item.base.rgn, drawable);
}
}
@ -1053,7 +1053,7 @@ static bool drawable_can_stream(DisplayChannel *display, Drawable *drawable)
return FALSE;
}
if (!is_primary_surface(display, drawable->surface->id)) {
if (!is_primary_surface(display, drawable->surface)) {
return FALSE;
}
@ -1174,7 +1174,7 @@ static void handle_self_bitmap(DisplayChannel *display, Drawable *drawable)
/* For 32bit non-primary surfaces we need to keep any non-zero
high bytes as the surface may be used as source to an alpha_blend */
if (!is_primary_surface(display, drawable->surface->id) &&
if (!is_primary_surface(display, drawable->surface) &&
image->u.bitmap.format == SPICE_BITMAP_FMT_32BIT &&
rgb32_data_has_alpha(width, height, dest_stride, dest, &all_set)) {
if (all_set) {