PolytreeDE/picom
1
0
Fork 0
mirror of https://github.com/yshui/picom.git synced 2024-11-03 04:33:49 -05:00
Code Releases Activity

backend: glx: tentatively enable glFinish for NVIDIA

Browse source 
We use the __GL_YIELD=usleep workaround when we detect the NVIDIA
driver, so we could use glFinish without the NVIDIA driver taking all
the CPU.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui 2020-04-22 18:05:04 +01:00
parent 7043b2da5e
commit 0efdb6c2d9
No known key found for this signature in database
GPG key ID: 37C999F617EA1A47
4 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/backend/driver.c
View file

@ -12,6 +12,13 @@
#include "compiler.h" #include "compiler.h"
#include "log.h" #include "log.h"
/// Apply driver specified global workarounds. It's safe to call this multiple times.
void apply_driver_workarounds(enum driver driver) {
if (driver & DRIVER_NVIDIA) {
setenv("__GL_YIELD", "usleep", true);
}
}
enum driver detect_driver(xcb_connection_t *c, backend_t *backend_data, xcb_window_t window) { enum driver detect_driver(xcb_connection_t *c, backend_t *backend_data, xcb_window_t window) {
enum driver ret = 0; enum driver ret = 0;
// First we try doing backend agnostic detection using RANDR // First we try doing backend agnostic detection using RANDR

3
src/backend/driver.h
View file

@ -32,6 +32,9 @@ enum driver {
/// Note, this is a best-effort test, so no guarantee all drivers will be detected. /// Note, this is a best-effort test, so no guarantee all drivers will be detected.
enum driver detect_driver(xcb_connection_t *, struct backend_base *, xcb_window_t); enum driver detect_driver(xcb_connection_t *, struct backend_base *, xcb_window_t);
/// Apply driver specified global workarounds. It's safe to call this multiple times.
void apply_driver_workarounds(enum driver);
// Print driver names to stdout, for diagnostics // Print driver names to stdout, for diagnostics
static inline void print_drivers(enum driver drivers) { static inline void print_drivers(enum driver drivers) {
if (drivers & DRIVER_AMDGPU) { if (drivers & DRIVER_AMDGPU) {

5
src/backend/gl/glx.c
View file

@ -466,10 +466,7 @@ static void glx_present(backend_t *base, const region_t *region attr_unused) {
struct _glx_data *gd = (void *)base; struct _glx_data *gd = (void *)base;
gl_present(base, region); gl_present(base, region);
glXSwapBuffers(gd->display, gd->target_win); glXSwapBuffers(gd->display, gd->target_win);
// XXX there should be no need to block, the core should wait for render to finish glFinish();
if (!gd->gl.is_nvidia) {
glFinish();
}
} }
static int glx_buffer_age(backend_t *base) { static int glx_buffer_age(backend_t *base) {

2
src/picom.c
View file

@ -1224,6 +1224,7 @@ static bool redirect_start(session_t *ps) {
// Re-detect driver since we now have a backend // Re-detect driver since we now have a backend
ps->drivers = detect_driver(ps->c, ps->backend_data, ps->root); ps->drivers = detect_driver(ps->c, ps->backend_data, ps->root);
apply_driver_workarounds(ps->drivers);
root_damaged(ps); root_damaged(ps);
@ -1965,6 +1966,7 @@ static session_t *session_init(int argc, char **argv, Display *dpy,
// window; non experimental backends always need a target window // window; non experimental backends always need a target window
ps->drivers = detect_driver(ps->c, ps->backend_data, ps->root); ps->drivers = detect_driver(ps->c, ps->backend_data, ps->root);
apply_driver_workarounds(ps->drivers);
// Initialize filters, must be preceded by OpenGL context creation // Initialize filters, must be preceded by OpenGL context creation
if (!ps->o.experimental_backends && !init_render(ps)) { if (!ps->o.experimental_backends && !init_render(ps)) {