diff options
| author | Eric Anholt <eric@anholt.net> | 2013-09-27 15:25:40 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2013-10-24 14:04:20 -0700 |
| commit | 6868923702d5cdb93d06627ea4f40abe99cda75a (patch) | |
| tree | 7037221cdea5b365f6c1f78b50e97aa5532f1709 /src/mesa/drivers/dri/radeon/radeon_screen.c | |
| parent | cf5d8fc310dbf59a61e4859b79219b3ac3b223ac (diff) | |
dri: Move driver config options to dri driver extensions.
This way they aren't all sitting in the global namespace (with the same
name per driver).
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_screen.c')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_screen.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c index 1a8dc6c9bbb..b0cc2d7084c 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c @@ -72,7 +72,9 @@ DRI_CONF_OPT_BEGIN_V(command_buffer_size,int,def, # min ":" # max ) \ DRI_CONF_OPT_END #if defined(RADEON_R100) /* R100 */ -PUBLIC const char __driConfigOptions[] = +static const __DRIconfigOptionsExtension radeon_config_options = { + .base = { __DRI_CONFIG_OPTIONS, 1 }, + .xml = DRI_CONF_BEGIN DRI_CONF_SECTION_PERFORMANCE DRI_CONF_TCL_MODE(DRI_CONF_TCL_CODEGEN) @@ -94,11 +96,13 @@ DRI_CONF_BEGIN DRI_CONF_SECTION_DEBUG DRI_CONF_NO_RAST("false") DRI_CONF_SECTION_END -DRI_CONF_END; +DRI_CONF_END +}; #elif defined(RADEON_R200) - -PUBLIC const char __driConfigOptions[] = +static const __DRIconfigOptionsExtension radeon_config_options = { + .base = { __DRI_CONFIG_OPTIONS, 1 }, + .xml = DRI_CONF_BEGIN DRI_CONF_SECTION_PERFORMANCE DRI_CONF_TCL_MODE(DRI_CONF_TCL_CODEGEN) @@ -121,8 +125,8 @@ DRI_CONF_BEGIN DRI_CONF_SECTION_DEBUG DRI_CONF_NO_RAST("false") DRI_CONF_SECTION_END -DRI_CONF_END; - +DRI_CONF_END +}; #endif #ifndef RADEON_INFO_TILE_CONFIG @@ -490,7 +494,7 @@ radeonCreateScreen2(__DRIscreen *sPriv) radeon_init_debug(); /* parse information in __driConfigOptions */ - driParseOptionInfo (&screen->optionCache, __driConfigOptions); + driParseOptionInfo (&screen->optionCache, radeon_config_options.xml); screen->chip_flags = 0; @@ -780,5 +784,6 @@ const struct __DriverAPIRec driDriverAPI = { PUBLIC const __DRIextension *__driDriverExtensions[] = { &driCoreExtension.base, &driDRI2Extension.base, + &radeon_config_options.base, NULL }; |