diff options
Diffstat (limited to 'platform/x11/os_x11.cpp')
| -rw-r--r-- | platform/x11/os_x11.cpp | 42 |
1 files changed, 36 insertions, 6 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 34ec8709c4..0db79fa3e9 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -5,8 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ +/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -243,7 +243,26 @@ Error OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_a // Set DRI_PRIME if not set. This means that Godot should default to a higher-power GPU if it exists. // Note: Due to the final '0' parameter to setenv any existing DRI_PRIME environment variables will not // be overwritten. - setenv("DRI_PRIME", "1", 0); + bool enable_dri_prime = true; + // Check if Nouveau is loaded, we don't want to force dGPU usage with that driver. + if (FileAccess *f = FileAccess::open("/proc/modules", FileAccess::READ)) { + // Match driver name + space + String nouveau_str = "nouveau "; + + while (!f->eof_reached()) { + String line = f->get_line(); + + if (line.begins_with(nouveau_str)) { + enable_dri_prime = false; + break; + } + } + f->close(); + memdelete(f); + } + if (enable_dri_prime) { + setenv("DRI_PRIME", "1", 0); + } ContextGL_X11::ContextType opengl_api_type = ContextGL_X11::GLES_3_0_COMPATIBLE; @@ -1885,12 +1904,23 @@ void OS_X11::process_xevents() { // Determine the axis used (called valuators in XInput for some forsaken reason) // Mask is a bitmask indicating which axes are involved. // We are interested in the values of axes 0 and 1. - if (raw_event->valuators.mask_len <= 0 || !XIMaskIsSet(raw_event->valuators.mask, 0) || !XIMaskIsSet(raw_event->valuators.mask, 1)) { + if (raw_event->valuators.mask_len <= 0) { break; } - double rel_x = raw_event->raw_values[0]; - double rel_y = raw_event->raw_values[1]; + const double *values = raw_event->raw_values; + + double rel_x = 0.0; + double rel_y = 0.0; + + if (XIMaskIsSet(raw_event->valuators.mask, 0)) { + rel_x = *values; + values++; + } + + if (XIMaskIsSet(raw_event->valuators.mask, 1)) { + rel_y = *values; + } // https://bugs.freedesktop.org/show_bug.cgi?id=71609 // http://lists.libsdl.org/pipermail/commits-libsdl.org/2015-June/000282.html |