Module Name: xsrc
Committed By: mrg
Date: Thu Jul 9 03:47:09 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-s3/dist/src: s3.h
Removed Files:
xsrc/external/mit/xf86-video-s3/dist: autogen.sh
Log Message:
merge xf86-video-s3-0.6.2
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-s3/dist/autogen.sh
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-s3/dist/src/s3.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-s3/dist/src/s3.h
diff -u xsrc/external/mit/xf86-video-s3/dist/src/s3.h:1.3 xsrc/external/mit/xf86-video-s3/dist/src/s3.h:1.4
--- xsrc/external/mit/xf86-video-s3/dist/src/s3.h:1.3 Fri Jun 5 23:23:19 2009
+++ xsrc/external/mit/xf86-video-s3/dist/src/s3.h Thu Jul 9 03:47:09 2009
@@ -163,6 +163,13 @@
int imageWidth;
int imageHeight;
Bool hwCursor;
+
+ Bool shadowFB;
+ int rotate;
+ unsigned char * ShadowPtr;
+ int ShadowPitch;
+ void (*PointerMoved)(int index, int x, int y);
+
} S3Rec, *S3Ptr;
#define S3PTR(p) ((S3Ptr)((p)->driverPrivate))
@@ -224,6 +231,15 @@
/* s3 gen cursor */
Bool S3_CursorInit(ScreenPtr pScreen);
+/* in s3_shadow.c */
+void S3PointerMoved(int index, int x, int y);
+void S3RefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
+void S3RefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
+void S3RefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
+void S3RefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
+void S3RefreshArea32(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
+
+
#define TRIO64_RAMDAC 0x8811
#define TI3025_RAMDAC 0x3025
#define TI3020_RAMDAC 0x3020
@@ -242,9 +258,4 @@
(pS3->Chipset == PCI_CHIP_AURORA64VP) || \
(pS3->Chipset == PCI_CHIP_TRIO64UVP) || \
(pS3->Chipset == PCI_CHIP_TRIO64V2_DXGX))
-
-#define HAS_STREAMS_PROCESSOR() ((pS3->Chipset == PCI_CHIP_AURORA64VP) || \
- (pS3->Chipset == PCI_CHIP_TRIO64UVP) || \
- (pS3->Chipset == PCI_CHIP_TRIO64V2_DXGX))
-
#endif /* _S3_H */
