diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:44:00 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:44:00 +0000 |
| commit | 35a5cf103e9e41d178f980f685307f8c8063a006 (patch) | |
| tree | 17ffd25f9890fc2a3187ef283ed3466d18eb166a /src/i830_dri.h | |
| parent | bec47f9369b6f02ce4537ab1ac547ba933609edc (diff) | |
Merge DRI-trunk-20040613 changes in programs/Xserver/hw/xfree86/drivers, with
the following notes:
- Savage and Mach64 (= ati/ati*.[ch] changes) DRI not merged due to insecurity.
- VIA driver converted to new drmContext and drmHandle names.
- Radeon driver merge conflicted in many places, and MergedFB at least could
probably use some checking at this point.
Diffstat (limited to 'src/i830_dri.h')
| -rw-r--r-- | src/i830_dri.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i830_dri.h b/src/i830_dri.h index b427dc84..684d7e32 100644 --- a/src/i830_dri.h +++ b/src/i830_dri.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h,v 1.5 2002/12/10 01:27:05 dawes 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 @@ -126,7 +126,7 @@ typedef struct _I830SAREA { unsigned int TexState3[I830_TEX_SETUP_SIZE]; unsigned int TexBlendState3[I830_TEXBLEND_SIZE]; unsigned int TexBlendStateWordsUsed3; - + unsigned int StippleState[I830_STP_SETUP_SIZE]; } I830SAREARec, *I830SAREAPtr; |