diff options
| author | Eric Anholt <eric@anholt.net> | 2013-06-26 15:22:13 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2013-08-17 11:43:19 +0200 |
| commit | bef423bee62f7b74858f1b7f74be21405ca75eef (patch) | |
| tree | 1652593dcdcb566e62637347ffe99ed55dc8e7a0 /src/mesa/drivers/dri/radeon/radeon_screen.c | |
| parent | 703a2f4219e6a95b7445138082e24cd762b1fa7e (diff) | |
dri: Choose a decent global driNConfigOptions.
Previously, we were asserting that each driver specified an NConfigOptions
exactly equal to the number of options they supplied, leading to frequent
bugs when people would forget to adjust the value when adjusting driver
options. Instead, just overallocate the table by a bit and leave sanity
checking to the assert in findOption().
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_screen.c')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_screen.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c index e7a27cf6a6d..dc44d4a105b 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c @@ -95,7 +95,6 @@ DRI_CONF_BEGIN DRI_CONF_NO_RAST("false") DRI_CONF_SECTION_END DRI_CONF_END; -static const GLuint __driNConfigOptions = 14; #elif defined(RADEON_R200) @@ -123,7 +122,6 @@ DRI_CONF_BEGIN DRI_CONF_NO_RAST("false") DRI_CONF_SECTION_END DRI_CONF_END; -static const GLuint __driNConfigOptions = 15; #endif @@ -492,8 +490,7 @@ radeonCreateScreen2(__DRIscreen *sPriv) radeon_init_debug(); /* parse information in __driConfigOptions */ - driParseOptionInfo (&screen->optionCache, - __driConfigOptions, __driNConfigOptions); + driParseOptionInfo (&screen->optionCache, __driConfigOptions); screen->chip_flags = 0; |