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

List planes by allocation order

Browse source 
Given a primary plane with zpos=0 and overlay planes with zpos 1 2, we want
first to allocate the primary plane, then the furthest overlay plane, then the
remaining one: 0 2 1.

References: https://github.com/emersion/libhwc/issues/3
This commit is contained in:
Simon Ser 2019-09-09 20:55:43 +03:00
parent dac885222b
commit e2df5e73d0
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
2 changed files with 37 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
display.c
View file

@ -8,7 +8,7 @@
#include "private.h"
static int guess_plane_zpos_from_type(struct hwc_display *display,
uint32_t plane_id, int type)
uint32_t plane_id, uint32_t type)
{
struct hwc_plane *primary;
@ -35,14 +35,14 @@ static int guess_plane_zpos_from_type(struct hwc_display *display,
static struct hwc_plane *plane_create(struct hwc_display *display, uint32_t id)
{
struct hwc_plane *plane;
struct hwc_plane *plane, *cur;
drmModePlane *drm_plane;
drmModeObjectProperties *drm_props;
uint32_t i;
drmModePropertyRes *drm_prop;
struct hwc_plane_property *prop;
uint64_t value;
bool has_zpos = false;
bool has_type = false, has_zpos = false;
plane = calloc(1, sizeof(*plane));
if (plane == NULL) {
@ -82,18 +82,45 @@ static struct hwc_plane *plane_create(struct hwc_display *display, uint32_t id)
plane->props_len++;
value = drm_props->prop_values[i];
if (strcmp(prop->name, "type") == 0 && !has_zpos) {
plane->zpos = guess_plane_zpos_from_type(display,
plane->id,
type);
if (strcmp(prop->name, "type") == 0) {
plane->type = value;
has_type = true;
} else if (strcmp(prop->name, "zpos") == 0) {
plane->zpos = zpos;
plane->zpos = value;
has_zpos = true;
}
}
drmModeFreeObjectProperties(drm_props);
hwc_list_insert(display->planes.prev, &plane->link);
if (!has_type) {
fprintf(stderr, "plane %d is missing the 'type' property\n",
plane->id);
free(plane);
return NULL;
} else if (!has_zpos) {
plane->zpos = guess_plane_zpos_from_type(display, plane->id,
plane->type);
}
/* During plane allocation, we will use the plane list order to fill
* planes with FBs. Primary planes need to be filled first, then planes
* far from the primary planes, then planes closer and closer to the
* primary plane. */
if (plane->type == DRM_PLANE_TYPE_PRIMARY) {
hwc_list_insert(&display->planes, &plane->link);
} else {
hwc_list_for_each(cur, &display->planes, link) {
if (cur->type != DRM_PLANE_TYPE_PRIMARY &&
plane->zpos >= cur->zpos) {
hwc_list_insert(cur->link.prev, &plane->link);
break;
}
}
if (plane->link.next == NULL) { /* not inserted */
hwc_list_insert(display->planes.prev, &plane->link);
}
}
return plane;
}

1
include/private.h
View file

@ -41,6 +41,7 @@ struct hwc_layer_property {
struct hwc_plane {
uint32_t id;
uint32_t possible_crtcs;
uint32_t type;
int zpos; /* greater values mean closer to the eye */
/* TODO: formats */
struct hwc_list link; /* hwc_display.planes */