diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2019-01-11 16:05:09 +0100 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2019-03-25 17:29:25 +0000 |
| commit | fe86694ddd930bd8b089ef4656f63bce000f72c9 (patch) | |
| tree | 248236b4c4d760d2c3a39fb58e449f29492496c3 | |
| parent | a1969c98cdc96202695134db822f82eb5152b43b (diff) | |
| download | mutter-fe86694ddd930bd8b089ef4656f63bce000f72c9.tar.gz | |
renderer/native: Make EGLStream page flip errors non-fatal
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
| -rw-r--r-- | src/backends/native/meta-renderer-native.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c index 771ca0872..c1247dfe4 100644 --- a/src/backends/native/meta-renderer-native.c +++ b/src/backends/native/meta-renderer-native.c @@ -103,8 +103,6 @@ typedef struct _MetaRendererNativeGpuData #ifdef HAVE_EGL_DEVICE struct { EGLDeviceEXT device; - - gboolean no_egl_output_drm_flip_event; } egl; #endif @@ -1485,8 +1483,6 @@ flip_egl_stream (MetaOnscreenNative *onscreen_native, renderer_gpu_data = meta_renderer_native_get_gpu_data (onscreen_native->renderer_native, onscreen_native->render_gpu); - if (renderer_gpu_data->egl.no_egl_output_drm_flip_event) - return FALSE; closure_container = 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 || error->code != EGL_RESOURCE_BUSY_EXT) { - g_warning ("Failed to flip EGL stream (%s), relying on clock from " - "now on", error->message); - renderer_gpu_data->egl.no_egl_output_drm_flip_event = TRUE; + g_warning ("Failed to flip EGL stream: %s", error->message); } g_error_free (error); meta_gpu_kms_flip_closure_container_free (closure_container); |