Module Name: xsrc
Committed By: mrg
Date: Sun Dec 30 06:59:35 UTC 2018
Modified Files:
xsrc/external/mit/xf86-video-r128/dist/src: r128_driver.c r128_exa.c
Log Message:
fix merge botch -- at least compiles now.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.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-r128/dist/src/r128_driver.c
diff -u xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.19 xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.20
--- xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.19 Sun Dec 30 06:46:48 2018
+++ xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c Sun Dec 30 06:59:35 2018
@@ -1588,7 +1588,6 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int
info->useEXA = FALSE;
#ifdef USE_EXA
-#ifndef HAVE_XAA_H
info->useEXA = TRUE;
#endif
Index: xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c
diff -u xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c:1.3 xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c:1.4
--- xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c:1.3 Sun Dec 30 06:46:48 2018
+++ xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c Sun Dec 30 06:59:35 2018
@@ -440,12 +440,10 @@ R128UploadToScreenHW(PixmapPtr pDst, int
uint32_t *s;
if (!R128GetDatatypeBpp(bpp, &datatype)) {
- R128TRACE(("R128GetDatatypeBpp failed\n"));
return FALSE;
}
if (!R128GetPixmapOffsetPitch(pDst, &dst_pitch_offset)) {
- R128TRACE(("R128GetPixmapOffsetPitch dest failed\n"));
return FALSE;
}
