6ed5d2e2b4
Threaded swap wait was added for using together with the Nvidia GLX driver due to the lack of anything equivalent to the INTEL_swap_event GLX extension. The purpose was to avoid inhibiting the invocation of idle callbacks when constantly rendering, as the combination of throttling on swap-interval 1 and glxSwapBuffers() and the frame clock source having higher priority than the default idle callback sources meant they would never be invoked. This was solved in gbz#779039 by introducing a thread that took care of the vsync waiting, pushing frame completion events to the main thread meaning the main thread could go idle while waiting to draw the next frame instead of blocking on glxSwapBuffers(). As of https://gitlab.gnome.org/GNOME/mutter/merge_requests/363, the main thread will instead use prediction to estimate when the next frame should be drawn. A side effect of this is that even without INTEL_swap_event, we would not block as much, or at all, on glxSwapBuffers(), as at the time it is called, we have likely already hit the vblank, or will hit it soon. After having introduced the swap waiting thread, it was observed that the Nvidia driver used a considerable amount of CPU waiting for the vblank, effectively wasting CPU time. The need to call glFinish() was also problematic as it would wait for the frame to finish, before continuing. Due to this, remove the threaded swap wait, and rely only on the frame clock not scheduling frames too early. Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=781835 Related: https://gitlab.gnome.org/GNOME/mutter/issues/700 [jadahl: Rewrote commit message] https://gitlab.gnome.org/GNOME/mutter/merge_requests/602
102 lines
2.9 KiB
C
102 lines
2.9 KiB
C
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
|
|
|
/*
|
|
* Copyright (C) 2016 Red Hat
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of the
|
|
* License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
* 02111-1307, USA.
|
|
*
|
|
* Written by:
|
|
* Jonas Ådahl <jadahl@gmail.com>
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <glib-object.h>
|
|
|
|
#include "backends/meta-backend-private.h"
|
|
#include "backends/meta-logical-monitor.h"
|
|
#include "backends/meta-renderer-view.h"
|
|
#include "backends/meta-renderer.h"
|
|
#include "backends/x11/meta-renderer-x11.h"
|
|
#include "clutter/x11/clutter-x11.h"
|
|
#include "cogl/cogl-xlib.h"
|
|
#include "cogl/cogl.h"
|
|
#include "cogl/winsys/cogl-winsys-egl-x11-private.h"
|
|
#include "cogl/winsys/cogl-winsys-glx-private.h"
|
|
#include "core/boxes-private.h"
|
|
#include "meta/meta-backend.h"
|
|
#include "meta/util.h"
|
|
|
|
G_DEFINE_TYPE (MetaRendererX11, meta_renderer_x11, META_TYPE_RENDERER)
|
|
|
|
static const CoglWinsysVtable *
|
|
get_x11_cogl_winsys_vtable (CoglRenderer *renderer)
|
|
{
|
|
#ifdef COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT
|
|
if (meta_is_wayland_compositor ())
|
|
return _cogl_winsys_egl_xlib_get_vtable ();
|
|
#endif
|
|
|
|
switch (renderer->driver)
|
|
{
|
|
case COGL_DRIVER_GLES2:
|
|
#ifdef COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT
|
|
return _cogl_winsys_egl_xlib_get_vtable ();
|
|
#else
|
|
break;
|
|
#endif
|
|
case COGL_DRIVER_GL:
|
|
case COGL_DRIVER_GL3:
|
|
#ifdef COGL_HAS_GLX_SUPPORT
|
|
return _cogl_winsys_glx_get_vtable ();
|
|
#else
|
|
break;
|
|
#endif
|
|
case COGL_DRIVER_ANY:
|
|
case COGL_DRIVER_NOP:
|
|
break;
|
|
}
|
|
g_assert_not_reached ();
|
|
return NULL;
|
|
}
|
|
|
|
static CoglRenderer *
|
|
meta_renderer_x11_create_cogl_renderer (MetaRenderer *renderer)
|
|
{
|
|
CoglRenderer *cogl_renderer;
|
|
Display *xdisplay = clutter_x11_get_default_display ();
|
|
|
|
cogl_renderer = cogl_renderer_new ();
|
|
cogl_renderer_set_custom_winsys (cogl_renderer, get_x11_cogl_winsys_vtable,
|
|
NULL);
|
|
cogl_xlib_renderer_set_foreign_display (cogl_renderer, xdisplay);
|
|
cogl_xlib_renderer_request_reset_on_video_memory_purge (cogl_renderer, TRUE);
|
|
|
|
return cogl_renderer;
|
|
}
|
|
|
|
static void
|
|
meta_renderer_x11_init (MetaRendererX11 *renderer_x11)
|
|
{
|
|
}
|
|
|
|
static void
|
|
meta_renderer_x11_class_init (MetaRendererX11Class *klass)
|
|
{
|
|
MetaRendererClass *renderer_class = META_RENDERER_CLASS (klass);
|
|
|
|
renderer_class->create_cogl_renderer = meta_renderer_x11_create_cogl_renderer;
|
|
}
|