diff options
| author | Brian Paul <[email protected]> | 2003-12-12 16:38:57 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2003-12-12 16:38:57 +0000 |
| commit | d450d0b0e228e5b16c04b2a1acb9ea549aa690f2 (patch) | |
| tree | 83eafc7c0c6f83acfe4024fb6bd5ed25751feb9e /src/mesa/drivers/dri/r128 | |
| parent | 177db2bc9bc5ac1103068dc874865263f6aa600c (diff) | |
applied Felix's patch for configuration system
Diffstat (limited to 'src/mesa/drivers/dri/r128')
| -rw-r--r-- | src/mesa/drivers/dri/r128/r128_context.c | 25 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r128/r128_screen.c | 27 |
2 files changed, 27 insertions, 25 deletions
diff --git a/src/mesa/drivers/dri/r128/r128_context.c b/src/mesa/drivers/dri/r128/r128_context.c index a26c9dd3401..73547aa67f7 100644 --- a/src/mesa/drivers/dri/r128/r128_context.c +++ b/src/mesa/drivers/dri/r128/r128_context.c @@ -59,30 +59,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "vblank.h" #include "utils.h" #include "texmem.h" - -/* R128 configuration - */ -#include "xmlpool.h" - -const char __driConfigOptions[] = -DRI_CONF_BEGIN - DRI_CONF_SECTION_PERFORMANCE - DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_0) - DRI_CONF_SECTION_END - DRI_CONF_SECTION_QUALITY - DRI_CONF_TEXTURE_DEPTH(DRI_CONF_TEXTURE_DEPTH_FB) - DRI_CONF_SECTION_END -#if ENABLE_PERF_BOXES - DRI_CONF_SECTION_DEBUG - DRI_CONF_PERFORMANCE_BOXES(false) - DRI_CONF_SECTION_END -#endif -DRI_CONF_END; -#if ENABLE_PERF_BOXES -const GLuint __driNConfigOptions = 3; -#else -const GLuint __driNConfigOptions = 2; -#endif +#include "xmlpool.h" /* for symbolic values of enum-type options */ #ifndef R128_DEBUG int R128_DEBUG = 0; diff --git a/src/mesa/drivers/dri/r128/r128_screen.c b/src/mesa/drivers/dri/r128/r128_screen.c index 8eee8bbe068..ac8f185a457 100644 --- a/src/mesa/drivers/dri/r128/r128_screen.c +++ b/src/mesa/drivers/dri/r128/r128_screen.c @@ -50,6 +50,30 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "glxextensions.h" #endif +/* R128 configuration + */ +#include "xmlpool.h" + +const char __driConfigOptions[] = +DRI_CONF_BEGIN + DRI_CONF_SECTION_PERFORMANCE + DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_0) + DRI_CONF_SECTION_END + DRI_CONF_SECTION_QUALITY + DRI_CONF_TEXTURE_DEPTH(DRI_CONF_TEXTURE_DEPTH_FB) + DRI_CONF_SECTION_END +#if ENABLE_PERF_BOXES + DRI_CONF_SECTION_DEBUG + DRI_CONF_PERFORMANCE_BOXES(false) + DRI_CONF_SECTION_END +#endif +DRI_CONF_END; +#if ENABLE_PERF_BOXES +static const GLuint __driNConfigOptions = 3; +#else +static const GLuint __driNConfigOptions = 2; +#endif + #if 1 /* Including xf86PciInfo.h introduces a bunch of errors... */ @@ -80,7 +104,8 @@ r128CreateScreen( __DRIscreenPrivate *sPriv ) if ( !r128Screen ) return NULL; /* parse information in __driConfigOptions */ - driParseOptionInfo (&r128Screen->optionCache); + driParseOptionInfo (&r128Screen->optionCache, + __driConfigOptions, __driNConfigOptions); /* This is first since which regions we map depends on whether or * not we are using a PCI card. |