mirror of
https://github.com/brl/mutter.git
synced 2024-11-24 09:00:42 -05:00
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.
This commit is contained in:
parent
58c2c2c444
commit
3e8364d11d
@ -96,8 +96,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
|
||||||
|
|
||||||
@ -1293,8 +1291,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, flip_closure);
|
meta_gpu_kms_wrap_flip_closure (onscreen_native->render_gpu, flip_closure);
|
||||||
@ -1315,9 +1311,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);
|
||||||
|
Loading…
Reference in New Issue
Block a user