summaryrefslogtreecommitdiff
path: root/src/ffb.h
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2005-01-14 06:08:03 +0000
committerAdam Jackson <ajax@nwnk.net>2005-01-14 06:08:03 +0000
commitf4d45d198607956fb059941905b990be952fd33f (patch)
treee4a5c387842b1c98cabed75c73b71aa7d94df364 /src/ffb.h
parent7c14b1189ac8605de9be3d85c338563396bb9c06 (diff)
Bug #1891: XAA support for Sun FFB. (Dave S. Miller)XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_1
Diffstat (limited to 'src/ffb.h')
-rw-r--r--src/ffb.h16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/ffb.h b/src/ffb.h
index af54db2..1be10dc 100644
--- a/src/ffb.h
+++ b/src/ffb.h
@@ -24,7 +24,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb.h,v 1.8 2002/12/06 02:44:03 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb.h,v 1.7tsi Exp $ */
#ifndef FFB_H
#define FFB_H
@@ -33,6 +33,7 @@
#include "xf86_OSproc.h"
#include "xf86_ansic.h"
#include "xf86RamDac.h"
+#include "xaa.h"
#include "Xmd.h"
#include "gcstruct.h"
#include "windowstr.h"
@@ -188,6 +189,19 @@ typedef struct {
unsigned char has_z_buffer;
unsigned char has_double_buffer;
+ /* XAA related info */
+ XAAInfoRecPtr pXAAInfo;
+ unsigned int xaa_fbc;
+ unsigned int xaa_wid;
+ unsigned int xaa_planemask;
+ unsigned int xaa_linepat;
+ int xaa_xdir, xaa_ydir, xaa_rop;
+ unsigned char *xaa_scanline_buffers[2];
+ int xaa_scanline_x, xaa_scanline_y, xaa_scanline_w;
+ unsigned char *xaa_tex;
+ int xaa_tex_pitch, xaa_tex_width, xaa_tex_height;
+ unsigned int xaa_tex_color;
+
enum ffb_resolution ffb_res;
BoxRec ClippedBoxBuf[64];
xRectangle Pf_Fixups[4];