From e0642763b68c7f0b79ea4545261bccfcb928591f Mon Sep 17 00:00:00 2001 From: Yuxuan Shui Date: Mon, 24 Jan 2022 18:04:57 +0000 Subject: [PATCH] Remove the glx-use-gpushader4 options Deprecated since v6. Signed-off-by: Yuxuan Shui --- src/config_libconfig.c | 8 ++++---- src/options.c | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/config_libconfig.c b/src/config_libconfig.c index 063b99f..e3004cb 100644 --- a/src/config_libconfig.c +++ b/src/config_libconfig.c @@ -606,10 +606,10 @@ char *parse_config_libconfig(options_t *opt, const char *config_file, bool *shad } // --glx-use-gpushader4 - if (config_lookup_bool(&cfg, "glx-use-gpushader4", &ival) && ival) { - log_warn("glx-use-gpushader4 is deprecated since v6, please remove it " - "from" - "your config file"); + if (config_lookup_bool(&cfg, "glx-use-gpushader4", &ival)) { + log_error("glx-use-gpushader4 has been removed, please remove it " + "from your config file"); + goto err; } // --xrender-sync if (config_lookup_bool(&cfg, "xrender-sync", &ival) && ival) { diff --git a/src/options.c b/src/options.c index 5d0e296..fa39d88 100644 --- a/src/options.c +++ b/src/options.c @@ -790,8 +790,9 @@ bool get_cfg(options_t *opt, int argc, char *const *argv, bool shadow_enable, P_CASEINT(302, resize_damage); case 303: // --glx-use-gpushader4 - log_warn("--glx-use-gpushader4 is deprecated since v6." + log_error("--glx-use-gpushader4 has been removed." " Please remove it from command line options."); + failed = true; break; case 304: // --opacity-rule