brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

onscreen/native: Do not use modifiers if surface should be sharable

Browse Source 
Importing a buffer allocated with a modifier into another GPU isn't
handled correctly yet in mutter. We'll want to fix that in the future,
for now just don't use modifiers in this case though, falling back to
GBM_BO_USE_LINEAR, to prevent issues due to mis-matched tiling
parameters.

Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/3791
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4219>
This commit is contained in:
Michel Dänzer 2025-01-16 18:04:51 +01:00 committed by Marge Bot
parent a4035fc68e
commit a211ed553b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backends/native/meta-onscreen-native.c
View File

@ -2250,6 +2250,7 @@ create_surfaces_gbm (CoglOnscreen *onscreen,
struct gbm_device *gbm_device; struct gbm_device *gbm_device;
struct gbm_surface *new_gbm_surface = NULL; struct gbm_surface *new_gbm_surface = NULL;
EGLNativeWindowType egl_native_window; EGLNativeWindowType egl_native_window;
gboolean should_be_sharable;
EGLSurface new_egl_surface; EGLSurface new_egl_surface;
EGLConfig egl_config; EGLConfig egl_config;
uint32_t format; uint32_t format;
@ -2261,6 +2262,8 @@ create_surfaces_gbm (CoglOnscreen *onscreen,
render_device_gbm = META_RENDER_DEVICE_GBM (renderer_gpu_data->render_device); render_device_gbm = META_RENDER_DEVICE_GBM (renderer_gpu_data->render_device);
gbm_device = meta_render_device_gbm_get_gbm_device (render_device_gbm); gbm_device = meta_render_device_gbm_get_gbm_device (render_device_gbm);
should_be_sharable = should_surface_be_sharable (onscreen);
if (!(cogl_renderer_egl->private_features & if (!(cogl_renderer_egl->private_features &
COGL_EGL_WINSYS_FEATURE_NO_CONFIG_CONTEXT) || COGL_EGL_WINSYS_FEATURE_NO_CONFIG_CONTEXT) ||
!choose_onscreen_egl_config (onscreen, &egl_config, error)) !choose_onscreen_egl_config (onscreen, &egl_config, error))
@ -2270,7 +2273,8 @@ create_surfaces_gbm (CoglOnscreen *onscreen,
cogl_renderer_egl->edpy, cogl_renderer_egl->edpy,
egl_config); egl_config);
if (meta_renderer_native_use_modifiers (renderer_native)) if (!should_be_sharable &&
meta_renderer_native_use_modifiers (renderer_native))
modifiers = get_supported_modifiers (onscreen, format); modifiers = get_supported_modifiers (onscreen, format);
else else
modifiers = NULL; modifiers = NULL;
@ -2289,7 +2293,7 @@ create_surfaces_gbm (CoglOnscreen *onscreen,
{ {
uint32_t flags = GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING; uint32_t flags = GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING;
if (should_surface_be_sharable (onscreen)) if (should_be_sharable)
flags |= GBM_BO_USE_LINEAR; flags |= GBM_BO_USE_LINEAR;
new_gbm_surface = gbm_surface_create (gbm_device, new_gbm_surface = gbm_surface_create (gbm_device,