Module Name: xsrc Committed By: christos Date: Sun May 15 23:16:15 UTC 2011
Modified Files: xsrc/external/mit/xf86-video-openchrome/dist/src: via_cursor.c via_driver.h via_video.c Log Message: Add missing prototypes and fix calling args. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/xf86-video-openchrome/dist/src/via_cursor.c \ xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h \ xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c 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-openchrome/dist/src/via_cursor.c diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_cursor.c:1.1.1.1 xsrc/external/mit/xf86-video-openchrome/dist/src/via_cursor.c:1.2 --- xsrc/external/mit/xf86-video-openchrome/dist/src/via_cursor.c:1.1.1.1 Thu May 27 03:31:59 2010 +++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_cursor.c Sun May 15 19:16:15 2011 @@ -39,8 +39,6 @@ #include "via_id.h" #include "cursorstr.h" -void viaShowCursor(ScrnInfoPtr pScrn); -void viaHideCursor(ScrnInfoPtr pScrn); static void viaSetCursorPosition(ScrnInfoPtr pScrn, int x, int y); static Bool viaUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs); static Bool viaUseHWCursorARGB(ScreenPtr pScreen, CursorPtr pCurs); Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h:1.1.1.1 xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h:1.2 --- xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h:1.1.1.1 Thu May 27 03:31:59 2010 +++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h Sun May 15 19:16:15 2011 @@ -525,4 +525,15 @@ #endif /* XF86DRI */ +int viaOffScreenLinear(VIAMemPtr mem, ScrnInfoPtr pScrn, unsigned long size); +void viaShowCursor(ScrnInfoPtr pScrn); +void viaHideCursor(ScrnInfoPtr pScrn); +Bool viaHWCursorInit(ScreenPtr pScreen); +void ViaDisplaySetStreamOnCRT(ScrnInfoPtr pScrn, Bool primary); +void ViaDisplaySetStreamOnDFP(ScrnInfoPtr pScrn, Bool primary); +void ViaDisplaySetStreamOnDVO(ScrnInfoPtr pScrn, int port, Bool primary); +void ViaDisplayEnableSimultaneous(ScrnInfoPtr pScrn); +void ViaDisplayEnableCRT(ScrnInfoPtr pScrn); +void ViaDisplayEnableDVO(ScrnInfoPtr pScrn, int port); + #endif /* _VIA_DRIVER_H_ */ Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c:1.1.1.1 xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c:1.2 --- xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c:1.1.1.1 Thu May 27 03:31:58 2010 +++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c Sun May 15 19:16:15 2011 @@ -51,6 +51,7 @@ #include <X11/extensions/Xv.h> #include "xaa.h" #include "xaalocal.h" +#include "damage.h" #include "dixstruct.h" #include "via_xvpriv.h" #include "via_swov.h" @@ -757,7 +758,7 @@ pBox++; } - DamageDamageRegion(pPix, clipBoxes); + DamageDamageRegion((DrawablePtr)pPix, clipBoxes); } return 0;