diff options
author | Dave Airlie <airliedfreedesktop.org> | 2004-02-06 00:16:26 +0000 |
---|---|---|
committer | Dave Airlie <airliedfreedesktop.org> | 2004-02-06 00:16:26 +0000 |
commit | 6c7bb5ebbde6dfe19ecf0e9c6790c28b8b2e8d1e (patch) | |
tree | a3fd56662e57965b870cd20889c6d7bf89f5bcc2 /src/mesa/drivers/dri/mach64/mach64_context.c | |
parent | 0fbeff2fa2e831e45e4dc6014c8f1e6abaa44aa1 (diff) |
Remove warnings from mach64 build, fix up some _SOLO stuff,
update to newer Mesa interfaces...
Diffstat (limited to 'src/mesa/drivers/dri/mach64/mach64_context.c')
-rw-r--r-- | src/mesa/drivers/dri/mach64/mach64_context.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/mach64/mach64_context.c b/src/mesa/drivers/dri/mach64/mach64_context.c index 4ebca8774a..205003a851 100644 --- a/src/mesa/drivers/dri/mach64/mach64_context.c +++ b/src/mesa/drivers/dri/mach64/mach64_context.c @@ -139,6 +139,10 @@ GLboolean mach64CreateContext( const __GLcontextModes *glVisual, mach64Screen = mmesa->mach64Screen = (mach64ScreenPtr)driScreen->private; + /* Parse configuration files */ + driParseConfigFiles (&mmesa->optionCache, &mach64Screen->optionCache, + mach64Screen->driScreen->myNum, "mach64"); + mmesa->sarea = (ATISAREAPrivPtr)((char *)driScreen->pSAREA + sizeof(XF86DRISAREARec)); @@ -210,13 +214,11 @@ GLboolean mach64CreateContext( const __GLcontextModes *glVisual, _swrast_allow_vertex_fog( ctx, GL_TRUE ); driInitExtensions( ctx, card_extensions, GL_TRUE ); + mach64InitVB( ctx ); mach64InitTriFuncs( ctx ); - mach64DDInitDriverFuncs( ctx ); - mach64DDInitIoctlFuncs( ctx ); mach64DDInitStateFuncs( ctx ); mach64DDInitSpanFuncs( ctx ); - mach64DDInitTextureFuncs( ctx ); mach64DDInitState( mmesa ); mmesa->do_irqs = (mmesa->mach64Screen->irq && !getenv("MACH64_NO_IRQS")); |