blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backend/drm: remove format arg from drm_plane_init_surface 

This was always set to ARGB8888.
This commit is contained in:
Simon Ser 2021-05-31 19:35:25 +02:00
parent 9e9be83a58
commit e06ea4e84a
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/drm/drm.c
View File

@ -676,10 +676,9 @@ static bool drm_connector_init_renderer(struct wlr_drm_connector *conn,
int width = mode.hdisplay;
int height = mode.vdisplay;
uint32_t format = DRM_FORMAT_ARGB8888;
bool modifiers = drm->addfb2_modifiers;
if (!drm_plane_init_surface(plane, drm, width, height, format, modifiers) ||
if (!drm_plane_init_surface(plane, drm, width, height, modifiers) ||
!drm_connector_pageflip_renderer(conn, state)) {
if (!modifiers) {
wlr_drm_conn_log(conn, WLR_ERROR, "Failed to initialize renderer:"
@ -694,8 +693,7 @@ static bool drm_connector_init_renderer(struct wlr_drm_connector *conn,
"retrying without modifiers");
modifiers = false;
if (!drm_plane_init_surface(plane, drm, width, height, format,
modifiers)) {
if (!drm_plane_init_surface(plane, drm, width, height, modifiers)) {
return false;
}
if (!drm_connector_pageflip_renderer(conn, state)) {
@ -860,8 +858,7 @@ static bool drm_connector_set_cursor(struct wlr_output *output,
ret = drmGetCap(drm->fd, DRM_CAP_CURSOR_HEIGHT, &h);
h = ret ? 64 : h;
if (!drm_plane_init_surface(plane, drm, w, h,
DRM_FORMAT_ARGB8888, true)) {
if (!drm_plane_init_surface(plane, drm, w, h, true)) {
wlr_drm_conn_log(conn, WLR_ERROR, "Cannot allocate cursor resources");
return false;
}

4
backend/drm/renderer.c
View File

@ -193,7 +193,9 @@ static struct wlr_drm_format *create_linear_format(uint32_t format) {
bool drm_plane_init_surface(struct wlr_drm_plane *plane,
struct wlr_drm_backend *drm, int32_t width, uint32_t height,
uint32_t format, bool with_modifiers) {
bool with_modifiers) {
uint32_t format = DRM_FORMAT_ARGB8888;
if (!wlr_drm_format_set_has(&plane->formats, format, DRM_FORMAT_MOD_INVALID)) {
const struct wlr_pixel_format_info *info =
drm_get_pixel_format_info(format);

2
include/backend/drm/renderer.h
View File

@ -57,7 +57,7 @@ bool drm_surface_render_black_frame(struct wlr_drm_surface *surf);
bool drm_plane_init_surface(struct wlr_drm_plane *plane,
struct wlr_drm_backend *drm, int32_t width, uint32_t height,
uint32_t format, bool with_modifiers);
bool with_modifiers);
void drm_plane_finish_surface(struct wlr_drm_plane *plane);
bool drm_plane_lock_surface(struct wlr_drm_plane *plane,
struct wlr_drm_backend *drm);