Merge pull request #1509 from emersion/gbm-fmt-mismatch

backend/drm: fix GBM format mismatch
This commit is contained in:
Drew DeVault 2019-01-29 10:39:54 -05:00 committed by GitHub
commit feb1b9b1cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 46 additions and 15 deletions

View file

@ -26,6 +26,8 @@ struct wlr_drm_plane {
struct wlr_drm_surface surf;
struct wlr_drm_surface mgpu_surf;
uint32_t drm_format; // ARGB8888 or XRGB8888
// Only used by cursor
float matrix[9];
struct gbm_bo *cursor_bo;

View file

@ -16,6 +16,8 @@ struct wlr_drm_renderer {
struct gbm_device *gbm;
struct wlr_egl egl;
uint32_t gbm_format;
struct wlr_renderer *wlr_rend;
};

View file

@ -14,7 +14,7 @@ void parse_edid(struct wlr_output *restrict output, size_t len,
// Returns the string representation of a DRM output type
const char *conn_get_name(uint32_t type_id);
// Returns the DRM framebuffer id for a gbm_bo
uint32_t get_fb_for_bo(struct gbm_bo *bo);
uint32_t get_fb_for_bo(struct gbm_bo *bo, uint32_t drm_format);
// Part of match_obj
enum {