#include "enums.h"
#include "texstore.h"
#include "texformat.h"
+#include "teximage.h"
+#include "texobj.h"
#include "imports.h"
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 )
mmesa->setup.secondary_tex_off = t1->offset;
}
- memcpy( &sarea->ContextState.tex_size_pitch, ®s->tex_size_pitch,
+ memcpy( &sarea->context_state.tex_size_pitch, ®s->tex_size_pitch,
MACH64_NR_TEXTURE_REGS * sizeof(GLuint) );
}
mach64DestroyTexObj( mmesa, t );
tObj->DriverData = NULL;
+ /* Free mipmap images and the texture object itself */
+ _mesa_delete_texture_object(ctx, tObj);
+
}
}