Remove an undocumented option
Removed --glx-reinit-on-root-change. Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
parent
2699367b46
commit
7e7c54761e
|
@ -831,14 +831,6 @@ void configure_root(session_t *ps, int width, int height) {
|
||||||
ps->list->reg_ignore_valid = false;
|
ps->list->reg_ignore_valid = false;
|
||||||
|
|
||||||
#ifdef CONFIG_OPENGL
|
#ifdef CONFIG_OPENGL
|
||||||
// Reinitialize GLX on root change
|
|
||||||
if (ps->o.glx_reinit_on_root_change && ps->psglx) {
|
|
||||||
if (!glx_reinit(ps, bkend_use_glx(ps)))
|
|
||||||
log_error("Failed to reinitialize GLX, troubles ahead.");
|
|
||||||
if (BKEND_GLX == ps->o.backend && !glx_init_blur(ps))
|
|
||||||
log_error("Failed to initialize filters.");
|
|
||||||
}
|
|
||||||
|
|
||||||
// GLX root change callback
|
// GLX root change callback
|
||||||
if (BKEND_GLX == ps->o.backend)
|
if (BKEND_GLX == ps->o.backend)
|
||||||
glx_on_root_change(ps);
|
glx_on_root_change(ps);
|
||||||
|
|
|
@ -117,8 +117,6 @@ typedef struct options_t {
|
||||||
switch_t redirected_force;
|
switch_t redirected_force;
|
||||||
/// Whether to stop painting. Controlled through D-Bus.
|
/// Whether to stop painting. Controlled through D-Bus.
|
||||||
switch_t stoppaint_force;
|
switch_t stoppaint_force;
|
||||||
/// Whether to reinitialize GLX on root size change.
|
|
||||||
bool glx_reinit_on_root_change;
|
|
||||||
/// Whether to enable D-Bus support.
|
/// Whether to enable D-Bus support.
|
||||||
bool dbus;
|
bool dbus;
|
||||||
/// Path to log file.
|
/// Path to log file.
|
||||||
|
|
22
src/opengl.c
22
src/opengl.c
|
@ -257,28 +257,6 @@ glx_destroy(session_t *ps) {
|
||||||
ps->psglx = NULL;
|
ps->psglx = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Reinitialize GLX.
|
|
||||||
*/
|
|
||||||
bool
|
|
||||||
glx_reinit(session_t *ps, bool need_render) {
|
|
||||||
// Reinitialize VSync as well
|
|
||||||
vsync_deinit(ps);
|
|
||||||
|
|
||||||
glx_destroy(ps);
|
|
||||||
if (!glx_init(ps, need_render)) {
|
|
||||||
log_error("Failed to initialize GLX.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!vsync_init(ps)) {
|
|
||||||
log_error("Failed to initialize VSync.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Callback to run on root window size change.
|
* Callback to run on root window size change.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -43,9 +43,6 @@ glx_init(session_t *ps, bool need_render);
|
||||||
void
|
void
|
||||||
glx_destroy(session_t *ps);
|
glx_destroy(session_t *ps);
|
||||||
|
|
||||||
bool
|
|
||||||
glx_reinit(session_t *ps, bool need_render);
|
|
||||||
|
|
||||||
void
|
void
|
||||||
glx_on_root_change(session_t *ps);
|
glx_on_root_change(session_t *ps);
|
||||||
|
|
||||||
|
|
|
@ -438,7 +438,6 @@ static const struct option longopts[] = {
|
||||||
{"no-name-pixmap", no_argument, NULL, 320},
|
{"no-name-pixmap", no_argument, NULL, 320},
|
||||||
{"log-level", required_argument, NULL, 321},
|
{"log-level", required_argument, NULL, 321},
|
||||||
{"log-file", required_argument, NULL, 322},
|
{"log-file", required_argument, NULL, 322},
|
||||||
{"glx-reinit-on-root-change", no_argument, NULL, 732},
|
|
||||||
{"experimental-backends", no_argument, NULL, 733},
|
{"experimental-backends", no_argument, NULL, 733},
|
||||||
{"monitor-repaint", no_argument, NULL, 800},
|
{"monitor-repaint", no_argument, NULL, 800},
|
||||||
{"diagnostics", no_argument, NULL, 801},
|
{"diagnostics", no_argument, NULL, 801},
|
||||||
|
@ -768,7 +767,6 @@ void get_cfg(options_t *opt, int argc, char *const *argv, bool shadow_enable,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
P_CASEBOOL(319, no_x_selection);
|
P_CASEBOOL(319, no_x_selection);
|
||||||
P_CASEBOOL(732, glx_reinit_on_root_change);
|
|
||||||
P_CASEBOOL(733, experimental_backends);
|
P_CASEBOOL(733, experimental_backends);
|
||||||
P_CASEBOOL(800, monitor_repaint);
|
P_CASEBOOL(800, monitor_repaint);
|
||||||
case 801: opt->print_diagnostics = true; break;
|
case 801: opt->print_diagnostics = true; break;
|
||||||
|
|
Loading…
Reference in New Issue