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
109 lines
3.3 KiB
C
109 lines
3.3 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* A Low Level GPU Graphics and Utilities API
|
|
*
|
|
* Copyright (C) 2011 Intel Corporation.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person
|
|
* obtaining a copy of this software and associated documentation
|
|
* files (the "Software"), to deal in the Software without
|
|
* restriction, including without limitation the rights to use, copy,
|
|
* modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
* of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*
|
|
*
|
|
*/
|
|
|
|
#ifndef __COGL_RENDERER_PRIVATE_H
|
|
#define __COGL_RENDERER_PRIVATE_H
|
|
|
|
#include <gmodule.h>
|
|
|
|
#include "cogl-object-private.h"
|
|
#include "cogl-driver.h"
|
|
#include "cogl-texture-driver.h"
|
|
#include "cogl-context.h"
|
|
#include "cogl-closure-list-private.h"
|
|
#include "winsys/cogl-winsys-private.h"
|
|
|
|
#ifdef COGL_HAS_XLIB_SUPPORT
|
|
#include <X11/Xlib.h>
|
|
#endif
|
|
|
|
typedef const CoglWinsysVtable *(*CoglCustomWinsysVtableGetter) (CoglRenderer *renderer);
|
|
|
|
struct _CoglRenderer
|
|
{
|
|
CoglObject _parent;
|
|
gboolean connected;
|
|
CoglDriver driver_override;
|
|
const CoglDriverVtable *driver_vtable;
|
|
const CoglTextureDriver *texture_driver;
|
|
const CoglWinsysVtable *winsys_vtable;
|
|
void *custom_winsys_user_data;
|
|
CoglCustomWinsysVtableGetter custom_winsys_vtable_getter;
|
|
CoglWinsysID winsys_id_override;
|
|
GList *constraints;
|
|
|
|
GArray *poll_fds;
|
|
int poll_fds_age;
|
|
GList *poll_sources;
|
|
|
|
CoglList idle_closures;
|
|
|
|
GList *outputs;
|
|
|
|
#ifdef COGL_HAS_XLIB_SUPPORT
|
|
Display *foreign_xdpy;
|
|
gboolean xlib_enable_event_retrieval;
|
|
gboolean xlib_want_reset_on_video_memory_purge;
|
|
#endif
|
|
|
|
CoglDriver driver;
|
|
unsigned long private_features
|
|
[COGL_FLAGS_N_LONGS_FOR_SIZE (COGL_N_PRIVATE_FEATURES)];
|
|
GModule *libgl_module;
|
|
|
|
/* List of callback functions that will be given every native event */
|
|
GSList *event_filters;
|
|
void *winsys;
|
|
};
|
|
|
|
typedef CoglFilterReturn (* CoglNativeFilterFunc) (void *native_event,
|
|
void *data);
|
|
|
|
CoglFilterReturn
|
|
_cogl_renderer_handle_native_event (CoglRenderer *renderer,
|
|
void *event);
|
|
|
|
void
|
|
_cogl_renderer_add_native_filter (CoglRenderer *renderer,
|
|
CoglNativeFilterFunc func,
|
|
void *data);
|
|
|
|
void
|
|
_cogl_renderer_remove_native_filter (CoglRenderer *renderer,
|
|
CoglNativeFilterFunc func,
|
|
void *data);
|
|
|
|
void *
|
|
_cogl_renderer_get_proc_address (CoglRenderer *renderer,
|
|
const char *name,
|
|
gboolean in_core);
|
|
|
|
#endif /* __COGL_RENDERER_PRIVATE_H */
|