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

renderer/native: Make EGLStream page flip errors non-fatal

Browse Source 
Just continue rendering; we don't care if we were busy once, as it'll most
likely work when we flip the next time.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/485
This commit is contained in:
Jonas Ådahl 2019-01-11 16:05:09 +01:00
parent a1969c98cd
commit fe86694ddd
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,8 +103,6 @@ typedef struct _MetaRendererNativeGpuData
#ifdef HAVE_EGL_DEVICE #ifdef HAVE_EGL_DEVICE
struct { struct {
EGLDeviceEXT device; EGLDeviceEXT device;
gboolean no_egl_output_drm_flip_event;
} egl; } egl;
#endif #endif
@ -1485,8 +1483,6 @@ flip_egl_stream (MetaOnscreenNative *onscreen_native,
renderer_gpu_data = renderer_gpu_data =
meta_renderer_native_get_gpu_data (onscreen_native->renderer_native, meta_renderer_native_get_gpu_data (onscreen_native->renderer_native,
onscreen_native->render_gpu); onscreen_native->render_gpu);
if (renderer_gpu_data->egl.no_egl_output_drm_flip_event)
return FALSE;
closure_container = closure_container =
meta_gpu_kms_wrap_flip_closure (onscreen_native->render_gpu, meta_gpu_kms_wrap_flip_closure (onscreen_native->render_gpu,
@ -1509,9 +1505,7 @@ flip_egl_stream (MetaOnscreenNative *onscreen_native,
if (error->domain != META_EGL_ERROR || if (error->domain != META_EGL_ERROR ||
error->code != EGL_RESOURCE_BUSY_EXT) error->code != EGL_RESOURCE_BUSY_EXT)
{ {
g_warning ("Failed to flip EGL stream (%s), relying on clock from " g_warning ("Failed to flip EGL stream: %s", error->message);
"now on", error->message);
renderer_gpu_data->egl.no_egl_output_drm_flip_event = TRUE;
} }
g_error_free (error); g_error_free (error);
meta_gpu_kms_flip_closure_container_free (closure_container); meta_gpu_kms_flip_closure_container_free (closure_container);