diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-12-12 16:38:57 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-12-12 16:38:57 +0000 |
| commit | d450d0b0e228e5b16c04b2a1acb9ea549aa690f2 (patch) | |
| tree | 83eafc7c0c6f83acfe4024fb6bd5ed25751feb9e /src/mesa/drivers/dri/sis | |
| parent | 177db2bc9bc5ac1103068dc874865263f6aa600c (diff) | |
applied Felix's patch for configuration system
Diffstat (limited to 'src/mesa/drivers/dri/sis')
| -rw-r--r-- | src/mesa/drivers/dri/sis/sis_context.c | 15 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/sis/sis_screen.c | 18 |
2 files changed, 17 insertions, 16 deletions
diff --git a/src/mesa/drivers/dri/sis/sis_context.c b/src/mesa/drivers/dri/sis/sis_context.c index 6aa6194408..7daa947a46 100644 --- a/src/mesa/drivers/dri/sis/sis_context.c +++ b/src/mesa/drivers/dri/sis/sis_context.c @@ -59,21 +59,6 @@ int GlobalCurrentHwcx = -1; int GlobalHwcxCountBase = 1; int GlobalCmdQueueLen = 0; -#include "xmlpool.h" - -const char __driConfigOptions[] = -DRI_CONF_BEGIN - DRI_CONF_SECTION_DEBUG - DRI_CONF_OPT_BEGIN(agp_disable,bool,false) - DRI_CONF_DESC(en,"Disable AGP vertex dispatch") - DRI_CONF_OPT_END - DRI_CONF_OPT_BEGIN(fallback_force,bool,false) - DRI_CONF_DESC(en,"Force software fallback") - DRI_CONF_OPT_END - DRI_CONF_SECTION_END -DRI_CONF_END; -const GLuint __driNConfigOptions = 2; - static const char * const card_extensions[] = { "GL_ARB_multitexture", diff --git a/src/mesa/drivers/dri/sis/sis_screen.c b/src/mesa/drivers/dri/sis/sis_screen.c index f1a51039d2..1d78801442 100644 --- a/src/mesa/drivers/dri/sis/sis_screen.c +++ b/src/mesa/drivers/dri/sis/sis_screen.c @@ -39,6 +39,21 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "sis_dri.h" #include "sis_lock.h" +#include "xmlpool.h" + +const char __driConfigOptions[] = +DRI_CONF_BEGIN + DRI_CONF_SECTION_DEBUG + DRI_CONF_OPT_BEGIN(agp_disable,bool,false) + DRI_CONF_DESC(en,"Disable AGP vertex dispatch") + DRI_CONF_OPT_END + DRI_CONF_OPT_BEGIN(fallback_force,bool,false) + DRI_CONF_DESC(en,"Force software fallback") + DRI_CONF_OPT_END + DRI_CONF_SECTION_END +DRI_CONF_END; +static const GLuint __driNConfigOptions = 2; + /* Create the device specific screen private data struct. */ static sisScreenPtr @@ -86,7 +101,8 @@ sisCreateScreen( __DRIscreenPrivate *sPriv ) sisScreen->driScreen = sPriv; /* parse information in __driConfigOptions */ - driParseOptionInfo(&sisScreen->optionCache); + driParseOptionInfo(&sisScreen->optionCache, + __driConfigOptions, __driNConfigOptions); return sisScreen; } |