diff options
author | Felix Kuehling <fxkuehl@gmx.de> | 2005-01-01 20:40:14 +0000 |
---|---|---|
committer | Felix Kuehling <fxkuehl@gmx.de> | 2005-01-01 20:40:14 +0000 |
commit | 1067ce0cea1392b4ea1cc1c2c940cec33efb9c96 (patch) | |
tree | 8a489032a80fea40a528c64e745cc5bd53aacfdf /src/mesa/drivers/dri/savage/savagestate.h | |
parent | 467d64a177d611293c6db14daf97997b389f3cb0 (diff) |
Removed all direct hardware access (MMIO, BCI) from the Savage DRI
driver. It uses the new DRM version 2.0.x now, which has just been
committed to DRM CVS.
Diffstat (limited to 'src/mesa/drivers/dri/savage/savagestate.h')
-rw-r--r-- | src/mesa/drivers/dri/savage/savagestate.h | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/src/mesa/drivers/dri/savage/savagestate.h b/src/mesa/drivers/dri/savage/savagestate.h index 2cbdb81de5..b1b402a184 100644 --- a/src/mesa/drivers/dri/savage/savagestate.h +++ b/src/mesa/drivers/dri/savage/savagestate.h @@ -28,43 +28,13 @@ #include "savagecontext.h" +void savageEmitOldState( savageContextPtr imesa ); +void savageEmitChangedState( savageContextPtr imesa ); + extern void savageDDUpdateHwState( GLcontext *ctx ); extern void savageDDInitState( savageContextPtr imesa ); extern void savageDDInitStateFuncs( GLcontext *ctx ); extern void savageDDRenderStart(GLcontext *ctx); extern void savageDDRenderEnd(GLcontext *ctx); -/*frank 2001/11/13 add macro for sarea state copy*/ -#if 0 -#define SAVAGE_STATE_COPY(ctx) { \ -ctx->sarea->setup[0]=ctx->Registers.DrawLocalCtrl.ui; \ -ctx->sarea->setup[1]=ctx->Registers.TexPalAddr.ui; \ -ctx->sarea->setup[2]=ctx->Registers.TexCtrl[0].ui; \ -ctx->sarea->setup[3]=ctx->Registers.TexCtrl[1].ui; \ -ctx->sarea->setup[4]=ctx->Registers.TexAddr[0].ui; \ -ctx->sarea->setup[5]=ctx->Registers.TexAddr[1].ui; \ -ctx->sarea->setup[6]=ctx->Registers.TexBlendCtrl[0].ui; \ -ctx->sarea->setup[7]=ctx->Registers.TexBlendCtrl[1].ui; \ -ctx->sarea->setup[8]=ctx->Registers.TexXprClr.ui; \ -ctx->sarea->setup[9]=ctx->Registers.TexDescr.ui; \ -ctx->sarea->setup[10]=ctx->Registers.FogTable.ni.ulEntry[0]; \ -ctx->sarea->setup[11]=ctx->Registers.FogTable.ni.ulEntry[1]; \ -ctx->sarea->setup[12]=ctx->Registers.FogTable.ni.ulEntry[2]; \ -ctx->sarea->setup[13]=ctx->Registers.FogTable.ni.ulEntry[3]; \ -ctx->sarea->setup[14]=ctx->Registers.FogTable.ni.ulEntry[4]; \ -ctx->sarea->setup[15]=ctx->Registers.FogTable.ni.ulEntry[5]; \ -ctx->sarea->setup[16]=ctx->Registers.FogTable.ni.ulEntry[6]; \ -ctx->sarea->setup[17]=ctx->Registers.FogTable.ni.ulEntry[7]; \ -ctx->sarea->setup[18]=ctx->Registers.FogCtrl.ui; \ -ctx->sarea->setup[19]=ctx->Registers.StencilCtrl.ui; \ -ctx->sarea->setup[20]=ctx->Registers.ZBufCtrl.ui; \ -ctx->sarea->setup[21]=ctx->Registers.ZBufOffset.ui; \ -ctx->sarea->setup[22]=ctx->Registers.DestCtrl.ui; \ -ctx->sarea->setup[23]=ctx->Registers.DrawCtrl0.ui; \ -ctx->sarea->setup[24]=ctx->Registers.DrawCtrl1.ui; \ -ctx->sarea->setup[25]=ctx->Registers.ZWatermarks.ui; \ -ctx->sarea->setup[26]=ctx->Registers.DestTexWatermarks.ui; \ -ctx->sarea->setup[27]=ctx->Registers.TexBlendColor.ui; \ -} -#endif #endif |