From 54f4f44843a2ea422cf78a04720562ecc1a5abfd Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 31 May 2004 00:58:34 +0000 Subject: fixup mach64 for newer build/types --- src/mesa/drivers/dri/mach64/mach64_context.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/mesa/drivers/dri/mach64/mach64_context.h') diff --git a/src/mesa/drivers/dri/mach64/mach64_context.h b/src/mesa/drivers/dri/mach64/mach64_context.h index e424c0bbbf..3b22eef7de 100644 --- a/src/mesa/drivers/dri/mach64/mach64_context.h +++ b/src/mesa/drivers/dri/mach64/mach64_context.h @@ -36,11 +36,9 @@ #include "dri_util.h" #include "drm.h" -#include "xf86drm.h" -#include "mach64_common.h" +#include "mach64_drm.h" #include "mtypes.h" -#include "mm.h" #include "mach64_reg.h" @@ -227,7 +225,7 @@ struct mach64_context { */ GLuint new_state; GLuint dirty; /* Hardware state to be updated */ - mach64_context_regs_t setup; + drm_mach64_context_regs_t setup; GLuint NewGLState; GLuint Fallback; @@ -310,7 +308,7 @@ struct mach64_context { int driFd; mach64ScreenPtr mach64Screen; /* Screen private DRI data */ - ATISAREAPrivPtr sarea; /* Private SAREA data */ + drm_mach64_sarea_t *sarea; /* Private SAREA data */ GLuint hardwareWentIdle; -- cgit v1.2.3