X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fmach64%2Fmach64_tex.c;h=6459deef7841ce23f4cf8d97667afd26708e5657;hb=7f5925d57c1405ff40acb2fd40b41ab4f189f7a4;hp=fc55939198c8e3471268fce21da9c53fda1b9f1a;hpb=001dc022fc8c463ff20030e2a54934c93d50c969;p=mesa.git

diff --git a/src/mesa/drivers/dri/mach64/mach64_tex.c b/src/mesa/drivers/dri/mach64/mach64_tex.c
index fc55939198c..6459deef784 100644
--- a/src/mesa/drivers/dri/mach64/mach64_tex.c
+++ b/src/mesa/drivers/dri/mach64/mach64_tex.c
@@ -379,8 +379,8 @@ void mach64EmitTexStateLocked( mach64ContextPtr mmesa,
 			       mach64TexObjPtr t0,
 			       mach64TexObjPtr t1 )
 {
-   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);
 
    /* for multitex, both textures must be local or AGP */
    if ( t0 && t1 )
@@ -405,7 +405,7 @@ void mach64EmitTexStateLocked( mach64ContextPtr mmesa,
       mmesa->setup.secondary_tex_off = t1->offset;
    }
 
-   memcpy( &sarea->ContextState.tex_size_pitch, &regs->tex_size_pitch,
+   memcpy( &sarea->context_state.tex_size_pitch, &regs->tex_size_pitch,
 	   MACH64_NR_TEXTURE_REGS * sizeof(GLuint) );
 }