From d67ef485804cab53499dd763db136070ef107a16 Mon Sep 17 00:00:00 2001 From: Mario Kleiner Date: Thu, 18 Jan 2018 08:16:20 +0200 Subject: [PATCH] i965/screen: Allow drirc to set 'allow_rgb10_configs' again. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Since setup of ALLOW_RGB10_CONFIGS was moved to i965's own brw_config_options.xml, this was hard-coded to false and could not be overriden by drirc. Add some parsing into i965's private screen->optionCache to enable drirc again. Fixes: b391fb26df9f1b ("dri_util: remove ALLOW_RGB10_CONFIGS option (v2)") Signed-off-by: Mario Kleiner Cc: Marek Olšák Cc: Tapani Pälli Reviewed-by: Marek Olšák Reviewed-by: Tapani Pälli --- src/mesa/drivers/dri/i965/intel_screen.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 190d8ecb115..9dbda5142e5 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -2395,7 +2395,12 @@ __DRIconfig **intelInitScreen2(__DRIscreen *dri_screen) return NULL; } /* parse information in __driConfigOptions */ - driParseOptionInfo(&screen->optionCache, brw_config_options.xml); + driOptionCache options; + memset(&options, 0, sizeof(options)); + + driParseOptionInfo(&options, brw_config_options.xml); + driParseConfigFiles(&screen->optionCache, &options, dri_screen->myNum, "i965"); + driDestroyOptionCache(&options); screen->driScrnPriv = dri_screen; dri_screen->driverPrivate = (void *) screen; -- 2.30.2