From 1c718c0d78cf4eae9e02b03a0abbec384db948a6 Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Fri, 22 Feb 2008 00:18:54 +0000 Subject: Use drm_i915_sarea instead of drmI830Sarea and remove i830_common.h --- src/mesa/drivers/dri/intel/server/i830_dri.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/mesa/drivers/dri/intel/server/i830_dri.h') diff --git a/src/mesa/drivers/dri/intel/server/i830_dri.h b/src/mesa/drivers/dri/intel/server/i830_dri.h index c2a3af8cbf..def049e7a6 100644 --- a/src/mesa/drivers/dri/intel/server/i830_dri.h +++ b/src/mesa/drivers/dri/intel/server/i830_dri.h @@ -1,16 +1,15 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h,v 1.4 2002/10/30 12:52:18 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h,v 1.6 2003/09/28 20:15:59 alanh Exp $ */ #ifndef _I830_DRI_H #define _I830_DRI_H #include "xf86drm.h" -#include "i830_common.h" #define I830_MAX_DRAWABLES 256 #define I830_MAJOR_VERSION 1 -#define I830_MINOR_VERSION 7 -#define I830_PATCHLEVEL 2 +#define I830_MINOR_VERSION 9 +#define I830_PATCHLEVEL 0 #define I830_REG_SIZE 0x80000 @@ -41,7 +40,7 @@ typedef struct _I830DRIRec { int bitsPerPixel; int unused11[8]; /* was front/back/depth/rotated offset/pitch */ - + int unused12; /* logTextureGranularity */ int unused13; /* textureOffset */ -- cgit v1.2.3