diff options
| author | Mario Kleiner <[email protected]> | 2018-01-18 08:16:20 +0200 |
|---|---|---|
| committer | Tapani Pälli <[email protected]> | 2018-01-18 08:18:47 +0200 |
| commit | d67ef485804cab53499dd763db136070ef107a16 (patch) | |
| tree | e8475f7c394ac18a8df1ad98c88e747e73ddffc7 | |
| parent | eac629deb68115e9ab520212c1af779eca4f38a3 (diff) | |
i965/screen: Allow drirc to set 'allow_rgb10_configs' again.
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 <[email protected]>
Cc: Marek Olšák <[email protected]>
Cc: Tapani Pälli <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Tapani Pälli <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_screen.c | 7 |
1 files changed, 6 insertions, 1 deletions
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; |