From ba5c49ab427d33915562b2c257db582c84eb7dd0 Mon Sep 17 00:00:00 2001 From: Jon Smirl Date: Fri, 12 Mar 2004 03:50:30 +0000 Subject: Make R128 driver use sarea/defines from DRM. removed r128_common.h and r128_sarea.h since they are redundant now. --- src/mesa/drivers/dri/r128/r128_texobj.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/mesa/drivers/dri/r128/r128_texobj.h') diff --git a/src/mesa/drivers/dri/r128/r128_texobj.h b/src/mesa/drivers/dri/r128/r128_texobj.h index e2ff1ac24d..057602d0a0 100644 --- a/src/mesa/drivers/dri/r128/r128_texobj.h +++ b/src/mesa/drivers/dri/r128/r128_texobj.h @@ -36,7 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef _R128_TEXOBJ_H_ #define _R128_TEXOBJ_H_ -#include "r128_sarea.h" #include "mm.h" /* Individual texture image information. @@ -63,7 +62,7 @@ struct r128_tex_obj { CARD32 textureFormat; /* Actual hardware format */ - r128_texture_regs_t setup; /* Setup regs for texture */ + drm_r128_texture_regs_t setup; /* Setup regs for texture */ }; #endif /* _R128_TEXOBJ_H_ */ -- cgit v1.2.3