62 lines
2.0 KiB
Diff
62 lines
2.0 KiB
Diff
From 344919ec833d29e977cad74f1151f7a0a6b99b3d Mon Sep 17 00:00:00 2001
|
|
From: Jeffy Chen <jeffy.chen@rock-chips.com>
|
|
Date: Fri, 23 Oct 2020 17:37:04 +0800
|
|
Subject: [PATCH 37/95] backend-drm: Support using ARGB8888 gbm_format
|
|
|
|
Tested with:
|
|
/etc/xdg/weston/weston.ini:
|
|
[core]
|
|
gbm-format=argb8888
|
|
|
|
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
|
|
---
|
|
libweston/backend-drm/drm-gbm.c | 8 ++++++--
|
|
libweston/backend-drm/drm.c | 3 +++
|
|
2 files changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libweston/backend-drm/drm-gbm.c b/libweston/backend-drm/drm-gbm.c
|
|
index f998178..03e1b6d 100644
|
|
--- a/libweston/backend-drm/drm-gbm.c
|
|
+++ b/libweston/backend-drm/drm-gbm.c
|
|
@@ -292,8 +292,10 @@ drm_output_render_gl(struct drm_output_state *state, pixman_region32_t *damage)
|
|
{
|
|
struct drm_output *output = state->output;
|
|
struct drm_device *device = output->device;
|
|
+ const struct pixel_format_info *format;
|
|
struct gbm_bo *bo;
|
|
struct drm_fb *ret;
|
|
+ bool is_opaque;
|
|
|
|
output->base.compositor->renderer->repaint_output(&output->base,
|
|
damage);
|
|
@@ -305,8 +307,10 @@ drm_output_render_gl(struct drm_output_state *state, pixman_region32_t *damage)
|
|
return NULL;
|
|
}
|
|
|
|
- /* The renderer always produces an opaque image. */
|
|
- ret = drm_fb_get_from_bo(bo, device, true, BUFFER_GBM_SURFACE);
|
|
+ format = pixel_format_get_info(output->gbm_format);
|
|
+ is_opaque = format && pixel_format_is_opaque(format);
|
|
+
|
|
+ ret = drm_fb_get_from_bo(bo, device, is_opaque, BUFFER_GBM_SURFACE);
|
|
if (!ret) {
|
|
weston_log("failed to get drm_fb for bo\n");
|
|
gbm_surface_release_buffer(output->gbm_surface, bo);
|
|
diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c
|
|
index 7760205..ed902e8 100644
|
|
--- a/libweston/backend-drm/drm.c
|
|
+++ b/libweston/backend-drm/drm.c
|
|
@@ -1618,6 +1618,9 @@ drm_output_init_pixman(struct drm_output *output, struct drm_backend *b)
|
|
};
|
|
|
|
switch (format) {
|
|
+ case DRM_FORMAT_ARGB8888:
|
|
+ pixman_format = PIXMAN_a8r8g8b8;
|
|
+ break;
|
|
case DRM_FORMAT_XRGB8888:
|
|
pixman_format = PIXMAN_x8r8g8b8;
|
|
break;
|
|
--
|
|
2.20.1
|
|
|