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_context.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/mesa/drivers/dri/r128/r128_context.h') diff --git a/src/mesa/drivers/dri/r128/r128_context.h b/src/mesa/drivers/dri/r128/r128_context.h index 0a8735fd08..de258da3f5 100644 --- a/src/mesa/drivers/dri/r128/r128_context.h +++ b/src/mesa/drivers/dri/r128/r128_context.h @@ -39,9 +39,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #ifdef GLX_DIRECT_RENDERING #include "dri_util.h" - -#include "xf86drm.h" -#include "r128_common.h" +#include "drm.h" +#include "r128_drm.h" #include "mtypes.h" @@ -121,7 +120,7 @@ struct r128_context { */ GLuint new_state; GLuint dirty; /* Hardware state to be updated */ - r128_context_regs_t setup; + drm_r128_context_regs_t setup; GLuint NewGLState; GLuint Fallback; @@ -199,7 +198,7 @@ struct r128_context { int driFd; r128ScreenPtr r128Screen; /* Screen private DRI data */ - R128SAREAPrivPtr sarea; /* Private SAREA data */ + drm_r128_sarea_t *sarea; /* Private SAREA data */ /* Performance counters */ -- cgit v1.2.3