isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 23:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

renderer/native: Create dummy offscreens if onscreens fail to allocate

Browse Source 
This is less dramatic than aborting, and could in theory be a temporary
issue, so handle it by rendering into an offscreen.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1828>
This commit is contained in:
Jonas Ådahl 2021-04-10 21:29:22 +02:00
parent db1d35c53d
commit ceff2a93ca
1 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/backends/native/meta-renderer-native.c
View File

@ -1007,6 +1007,29 @@ should_force_shadow_fb (MetaRendererNative *renderer_native,
return FALSE; return FALSE;
} }
static CoglFramebuffer *
create_fallback_offscreen (MetaRendererNative *renderer_native,
CoglContext *cogl_context,
int width,
int height)
{
CoglOffscreen *fallback_offscreen;
GError *error = NULL;
fallback_offscreen = meta_renderer_native_create_offscreen (renderer_native,
cogl_context,
width,
height,
&error);
if (!fallback_offscreen)
{
g_error ("Failed to create fallback offscreen framebuffer: %s",
error->message);
}
return COGL_FRAMEBUFFER (fallback_offscreen);
}
static MetaRendererView * static MetaRendererView *
meta_renderer_native_create_view (MetaRenderer *renderer, meta_renderer_native_create_view (MetaRenderer *renderer,
MetaLogicalMonitor *logical_monitor, MetaLogicalMonitor *logical_monitor,
@ -1041,10 +1064,12 @@ meta_renderer_native_create_view (MetaRenderer *renderer,
if (META_IS_CRTC_KMS (crtc)) if (META_IS_CRTC_KMS (crtc))
{ {
MetaGpuKms *gpu_kms = META_GPU_KMS (meta_crtc_get_gpu (crtc));
MetaGpuKms *primary_gpu_kms = renderer_native->primary_gpu_kms;
MetaOnscreenNative *onscreen_native; MetaOnscreenNative *onscreen_native;
onscreen_native = meta_onscreen_native_new (renderer_native, onscreen_native = meta_onscreen_native_new (renderer_native,
renderer_native->primary_gpu_kms, primary_gpu_kms,
output, output,
crtc, crtc,
cogl_context, cogl_context,
@ -1052,11 +1077,20 @@ meta_renderer_native_create_view (MetaRenderer *renderer,
onscreen_height); onscreen_height);
if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (onscreen_native), &error)) if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (onscreen_native), &error))
g_error ("Failed to allocate onscreen framebuffer: %s", error->message); {
g_warning ("Failed to allocate onscreen framebuffer for %s",
use_shadowfb = should_force_shadow_fb (renderer_native, meta_gpu_kms_get_file_path (gpu_kms));
renderer_native->primary_gpu_kms); framebuffer = create_fallback_offscreen (renderer_native,
framebuffer = COGL_FRAMEBUFFER (onscreen_native); cogl_context,
onscreen_width,
onscreen_height);
}
else
{
use_shadowfb = should_force_shadow_fb (renderer_native,
primary_gpu_kms);
framebuffer = COGL_FRAMEBUFFER (onscreen_native);
}
} }
else else
{ {