diff options
Diffstat (limited to 'unichrome/via_video.c')
| -rw-r--r-- | unichrome/via_video.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/unichrome/via_video.c b/unichrome/via_video.c index c388dc3..a99ced3 100644 --- a/unichrome/via_video.c +++ b/unichrome/via_video.c @@ -33,7 +33,6 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "xf86Resources.h" -#include "xf86_ansic.h" #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h" @@ -114,7 +113,11 @@ static int viaGetPortAttribute(ScrnInfoPtr, Atom, INT32 *, pointer); static int viaSetPortAttribute(ScrnInfoPtr, Atom, INT32, pointer); static int viaPutImage(ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char *, short, short, Bool, +#ifdef USE_OLD_XVABI RegionPtr, pointer); +#else + RegionPtr, pointer, DrawablePtr); +#endif static void nv12Blit(unsigned char *nv12Chroma, const unsigned char *uBuffer, const unsigned char *vBuffer, @@ -636,7 +639,11 @@ RegionsEqual(RegionPtr A, RegionPtr B) static int viaReputImage(ScrnInfoPtr pScrn, - short drw_x, short drw_y, RegionPtr clipBoxes, pointer data) + short drw_x, short drw_y, RegionPtr clipBoxes, pointer data +#ifndef USE_OLD_XVABI + , DrawablePtr pDraw +#endif + ) { DDUPDATEOVERLAY UpdateOverlay_Video; @@ -1133,7 +1140,11 @@ viaPutImage(ScrnInfoPtr pScrn, short src_w, short src_h, short drw_w, short drw_h, int id, unsigned char *buf, - short width, short height, Bool sync, RegionPtr clipBoxes, pointer data) + short width, short height, Bool sync, RegionPtr clipBoxes, pointer data +#ifndef USE_OLD_XVABI + , DrawablePtr pDraw +#endif + ) { VIAPtr pVia = VIAPTR(pScrn); viaPortPrivPtr pPriv = (viaPortPrivPtr) data; |