Add color tiling support to miniglx for radeon

[mesa.git] / src / mesa / drivers / dri / mach64 / mach64_tex.c

diff --git a/src/mesa/drivers/dri/mach64/mach64_tex.c b/src/mesa/drivers/dri/mach64/mach64_tex.c
index 1ac42e330dc599613abc5386751f99597381a065..6459deef7841ce23f4cf8d97667afd26708e5657 100644 (file)
--- a/src/mesa/drivers/dri/mach64/mach64_tex.c
+++ b/src/mesa/drivers/dri/mach64/mach64_tex.c
@@ -42,6 +42,8 @@
 #include "enums.h"
 #include "texstore.h"
 #include "texformat.h"
+#include "teximage.h"
+#include "texobj.h"
 #include "imports.h"
 
 
@@ -377,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 )
@@ -403,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) );
 }
 
@@ -568,6 +570,9 @@ static void mach64DDDeleteTexture( GLcontext *ctx,
 
       mach64DestroyTexObj( mmesa, t );
       tObj->DriverData = NULL;
+      /* Free mipmap images and the texture object itself */
+      _mesa_delete_texture_object(ctx, tObj);
+
    }
 }