Module Name: xsrc
Committed By: macallan
Date: Mon Aug 25 15:27:00 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-igs/dist/src: igs_accel.c igs_driver.c
Log Message:
clang appeasement
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.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-igs/dist/src/igs_accel.c
diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.8 xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.9
--- xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.8 Wed Dec 14 23:58:54 2011
+++ xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c Mon Aug 25 15:27:00 2014
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $NetBSD: igs_accel.c,v 1.8 2011/12/14 23:58:54 macallan Exp $ */
+/* $NetBSD: igs_accel.c,v 1.9 2014/08/25 15:27:00 macallan Exp $ */
#include <sys/types.h>
@@ -77,8 +77,8 @@ IgsWaitMarker(ScreenPtr pScreen, int Mar
ENTER;
IgsWrite1(fPtr, IGS_COP_MAP_FMT_REG, fPtr->mapfmt);
- while ((IgsRead1(fPtr,
- IGS_COP_CTL_REG) & (IGS_COP_CTL_BUSY | IGS_COP_CTL_HFEMPTZ) != 0)
+ while (((IgsRead1(fPtr,
+ IGS_COP_CTL_REG) & (IGS_COP_CTL_BUSY | IGS_COP_CTL_HFEMPTZ)) != 0)
&& (bail > 0)) {
bail--;
IgsWrite1(fPtr, IGS_COP_MAP_FMT_REG, fPtr->mapfmt);
@@ -257,8 +257,8 @@ IgsUploadToScreen(PixmapPtr pDst, int x,
{
ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
IgsPtr fPtr = IGSPTR(pScrn);
- char *dst = fPtr->fbmem + exaGetPixmapOffset(pDst);
- int dst_pitch = exaGetPixmapPitch(pDst);
+ unsigned char *dst = fPtr->fbmem + exaGetPixmapOffset(pDst);
+ int dst_pitch = exaGetPixmapPitch(pDst);
int bpp = pDst->drawable.bitsPerPixel;
int cpp = (bpp + 7) >> 3;
@@ -287,8 +287,8 @@ IgsDownloadFromScreen(PixmapPtr pSrc, in
{
ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum];
IgsPtr fPtr = IGSPTR(pScrn);
- char *src = fPtr->fbmem + exaGetPixmapOffset(pSrc);
- int src_pitch = exaGetPixmapPitch(pSrc);
+ unsigned char *src = fPtr->fbmem + exaGetPixmapOffset(pSrc);
+ int src_pitch = exaGetPixmapPitch(pSrc);
int bpp = pSrc->drawable.bitsPerPixel;
int cpp = (bpp + 7) >> 3;
@@ -347,7 +347,9 @@ IgsInitAccel(ScreenPtr pScreen)
pExa->pixmapOffsetAlign = 4;
pExa->pixmapPitchAlign = 4;
- pExa->flags = EXA_OFFSCREEN_PIXMAPS;
+ pExa->flags = EXA_OFFSCREEN_PIXMAPS |
+ EXA_SUPPORTS_OFFSCREEN_OVERLAPS |
+ EXA_MIXED_PIXMAPS;
pExa->maxX = 2048;
pExa->maxY = 2048;
Index: xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c
diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.10 xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.11
--- xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.10 Tue Nov 5 11:26:43 2013
+++ xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c Mon Aug 25 15:27:00 2014
@@ -1,5 +1,5 @@
/* $OpenBSD: wsfb_driver.c,v 1.19 2003/04/27 16:42:32 matthieu Exp $ */
-/* $NetBSD: igs_driver.c,v 1.10 2013/11/05 11:26:43 macallan Exp $ */
+/* $NetBSD: igs_driver.c,v 1.11 2014/08/25 15:27:00 macallan Exp $ */
/*
* Copyright (c) 2001 Matthieu Herrb
* 2009 Michael Lorenz
@@ -413,7 +413,7 @@ IgsProbe(DriverPtr drv, int flags)
cPtr->Chipset = chipset;
cPtr->fb_paddr =
((uint32_t)igs_ext_read(IGS_EXT_LINA_HI)) << 24;
- xf86Msg(X_ERROR, "Aperture at %08x\n", cPtr->fb_paddr);
+ xf86Msg(X_ERROR, "Aperture at %08lx\n", cPtr->fb_paddr);
}
}
}
