summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/mach64/mach64_state.c
diff options
context:
space:
mode:
authorDave Airlie <airliedfreedesktop.org>2004-05-31 00:58:34 +0000
committerDave Airlie <airliedfreedesktop.org>2004-05-31 00:58:34 +0000
commit54f4f44843a2ea422cf78a04720562ecc1a5abfd (patch)
tree30b978cbbdc1df2a4be3b5d0181c5824da2bf9fe /src/mesa/drivers/dri/mach64/mach64_state.c
parent11b3028e7ba2fc3b985ab84d7227c290608f83f6 (diff)
fixup mach64 for newer build/types
Diffstat (limited to 'src/mesa/drivers/dri/mach64/mach64_state.c')
-rw-r--r--src/mesa/drivers/dri/mach64/mach64_state.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/mach64/mach64_state.c b/src/mesa/drivers/dri/mach64/mach64_state.c
index f81e91a3c9..99c8bad6c1 100644
--- a/src/mesa/drivers/dri/mach64/mach64_state.c
+++ b/src/mesa/drivers/dri/mach64/mach64_state.c
@@ -916,8 +916,8 @@ static void mach64DDPrintDirty( const char *msg, GLuint state )
*/
void mach64EmitHwStateLocked( mach64ContextPtr mmesa )
{
- ATISAREAPrivPtr sarea = mmesa->sarea;
- mach64_context_regs_t *regs = &(mmesa->setup);
+ drm_mach64_sarea_t *sarea = mmesa->sarea;
+ drm_mach64_context_regs_t *regs = &(mmesa->setup);
mach64TexObjPtr t0 = mmesa->CurrentTexObj[0];
mach64TexObjPtr t1 = mmesa->CurrentTexObj[1];
@@ -940,7 +940,7 @@ void mach64EmitHwStateLocked( mach64ContextPtr mmesa )
}
if ( mmesa->dirty & (MACH64_UPLOAD_CONTEXT | MACH64_UPLOAD_MISC) ) {
- memcpy( &sarea->ContextState, regs,
+ memcpy( &sarea->context_state, regs,
MACH64_NR_CONTEXT_REGS * sizeof(GLuint) );
}