Miroirs/libliftoff
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/emersion/libliftoff.git synced 2025-01-30 20:34:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename on_top to over

Browse source 
Rename has_composited_layer_on_top to has_composited_layer_over. This is more
consistent with has_allocated_layer_over.

While at it, add a comment to explain why has_allocated_layer_over is named like
so.
This commit is contained in:
Simon Ser 2019-09-16 00:00:03 +03:00
parent 7382dfd346
commit 0596d6f66e
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
display.c
View file

@ -410,9 +410,9 @@ static bool is_layer_allocated(struct plane_data *data,
return false; return false;
} }
static bool has_composited_layer_on_top(struct liftoff_output *output, static bool has_composited_layer_over(struct liftoff_output *output,
struct plane_data *data, struct plane_data *data,
struct liftoff_layer *layer) struct liftoff_layer *layer)
{ {
struct liftoff_layer *other_layer; struct liftoff_layer *other_layer;
struct liftoff_layer_property *zpos_prop, *other_zpos_prop; struct liftoff_layer_property *zpos_prop, *other_zpos_prop;
@ -475,6 +475,9 @@ static bool has_allocated_layer_over(struct liftoff_output *output,
continue; continue;
} }
/* Since plane zpos is descending, this means the other layer is
* supposed to be under but is mapped to a plane over the
* current one. */
if (zpos_prop->value > other_zpos_prop->value && if (zpos_prop->value > other_zpos_prop->value &&
layer_intersects(layer, other_layer)) { layer_intersects(layer, other_layer)) {
return true; return true;
@ -595,7 +598,7 @@ bool output_choose_layers(struct liftoff_output *output,
} }
if (plane->type != DRM_PLANE_TYPE_PRIMARY && if (plane->type != DRM_PLANE_TYPE_PRIMARY &&
has_composited_layer_on_top(output, data, layer)) { has_composited_layer_over(output, data, layer)) {
fprintf(stderr, "Layer %p -> plane %"PRIu32": " fprintf(stderr, "Layer %p -> plane %"PRIu32": "
"has composited layer on top\n", "has composited layer on top\n",
(void *)layer, plane->id); (void *)layer, plane->id);