Module Name: xsrc
Committed By: macallan
Date: Fri Oct 25 09:20:37 UTC 2024
Modified Files:
xsrc/external/mit/xf86-video-ngle/dist/src: ngle_accel.c
Log Message:
Set S bit in IBOvals in NGLEPrepareCopy_EG() - without it we get garbage on the
right border. Don't seem to need it on HCRX.
While there, don't blindly assume 8bit colour when accessing off-screen memory.
Shouldn't make a difference now but we may eventually support 24bit devices that
have off-screen memory ( or figure out how to access it on HCRX )
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-ngle/dist/src/ngle_accel.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-ngle/dist/src/ngle_accel.c
diff -u xsrc/external/mit/xf86-video-ngle/dist/src/ngle_accel.c:1.4 xsrc/external/mit/xf86-video-ngle/dist/src/ngle_accel.c:1.5
--- xsrc/external/mit/xf86-video-ngle/dist/src/ngle_accel.c:1.4 Fri Oct 25 07:15:41 2024
+++ xsrc/external/mit/xf86-video-ngle/dist/src/ngle_accel.c Fri Oct 25 09:20:37 2024
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $NetBSD: ngle_accel.c,v 1.4 2024/10/25 07:15:41 macallan Exp $ */
+/* $NetBSD: ngle_accel.c,v 1.5 2024/10/25 09:20:37 macallan Exp $ */
#include <sys/types.h>
#include <dev/ic/stireg.h>
@@ -118,11 +118,10 @@ NGLEPrepareCopy_EG
DBGMSG(X_ERROR, "%s %d %d\n", __func__, srcoff, srcpitch);
fPtr->offset = srcoff >> 11;
NGLEWaitMarker(pDstPixmap->drawable.pScreen, 0);
- /* XXX HCRX needs ifferent values here */
NGLEWrite4(fPtr, NGLE_REG_10,
BA(IndexedDcd, Otc04, Ots08, AddrLong, 0, BINapp0I, 0));
NGLEWrite4(fPtr, NGLE_REG_14,
- IBOvals(RopSrc, 0, BitmapExtent08, 0, DataDynamic, MaskOtc, 0, 0));
+ IBOvals(RopSrc, 0, BitmapExtent08, 1, DataDynamic, MaskOtc, 0, 0));
NGLEWrite4(fPtr, NGLE_REG_13, planemask);
fPtr->hwmode = HW_BLIT;
@@ -270,7 +269,7 @@ NGLESolid(
ENTER;
- y1 += offset >> 11;
+ y1 += offset / pitch;
/*
* XXX
@@ -391,7 +390,7 @@ NGLEInitAccel(ScreenPtr pScreen)
break;
default:
xf86Msg(X_ERROR,
- "unsupported dvice GID %08x\n", fPtr->gid);
+ "unsupported device GID %08x\n", fPtr->gid);
return FALSE;
}
NGLEWaitMarker(pScreen, 0);
