Module Name: xsrc
Committed By: christos
Date: Thu Feb 20 18:53:48 UTC 2025
Modified Files:
xsrc/external/mit/xf86-video-ngle/dist/src: ngle.h ngle_driver.c
summit_accel.c
Log Message:
Fix the build. Commented out code that is missing #defines
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-video-ngle/dist/src/ngle.h
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xf86-video-ngle/dist/src/ngle_driver.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-ngle/dist/src/summit_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.h
diff -u xsrc/external/mit/xf86-video-ngle/dist/src/ngle.h:1.6 xsrc/external/mit/xf86-video-ngle/dist/src/ngle.h:1.7
--- xsrc/external/mit/xf86-video-ngle/dist/src/ngle.h:1.6 Wed Jan 22 07:55:06 2025
+++ xsrc/external/mit/xf86-video-ngle/dist/src/ngle.h Thu Feb 20 13:53:48 2025
@@ -63,6 +63,7 @@ typedef struct {
xf86CursorInfoPtr CursorInfoRec;
OptionInfoPtr Options;
ExaDriverPtr pExa;
+ GlyphsProcPtr glyphs;
uint32_t gid, buf, fbacc, creg;
int offset, hwmode, offsetd;
#define HW_FB 0
Index: xsrc/external/mit/xf86-video-ngle/dist/src/ngle_driver.c
diff -u xsrc/external/mit/xf86-video-ngle/dist/src/ngle_driver.c:1.10 xsrc/external/mit/xf86-video-ngle/dist/src/ngle_driver.c:1.11
--- xsrc/external/mit/xf86-video-ngle/dist/src/ngle_driver.c:1.10 Wed Jan 22 07:55:06 2025
+++ xsrc/external/mit/xf86-video-ngle/dist/src/ngle_driver.c Thu Feb 20 13:53:48 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: ngle_driver.c,v 1.10 2025/01/22 12:55:06 macallan Exp $ */
+/* $NetBSD: ngle_driver.c,v 1.11 2025/02/20 18:53:48 christos Exp $ */
/*
* Copyright (c) 2024 Michael Lorenz
* All rights reserved.
@@ -228,12 +228,12 @@ ngle_mmap(size_t len, off_t off, int fd,
mapaddr = (pointer) mmap(NULL, len,
PROT_READ, MAP_SHARED,
fd, off);
- xf86Msg(X_ERROR, "mapping %08x read only\n", off);
+ xf86Msg(X_ERROR, "mapping %08tx read only\n", off);
} else {
mapaddr = (pointer) mmap(NULL, len,
PROT_READ | PROT_WRITE, MAP_SHARED,
fd, off);
- xf86Msg(X_ERROR, "mapping %08x read/write\n", off);
+ xf86Msg(X_ERROR, "mapping %08tx read/write\n", off);
}
if (mapaddr == (pointer) -1) {
mapaddr = NULL;
@@ -686,7 +686,7 @@ NGLESwitchMode(SWITCH_MODE_ARGS_DECL)
}
static int
-NGLEValidMode(SCRN_ARG_TYPE, DisplayModePtr mode, Bool verbose, int flags)
+NGLEValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
{
return MODE_OK;
Index: xsrc/external/mit/xf86-video-ngle/dist/src/summit_accel.c
diff -u xsrc/external/mit/xf86-video-ngle/dist/src/summit_accel.c:1.7 xsrc/external/mit/xf86-video-ngle/dist/src/summit_accel.c:1.8
--- xsrc/external/mit/xf86-video-ngle/dist/src/summit_accel.c:1.7 Tue Feb 18 07:17:20 2025
+++ xsrc/external/mit/xf86-video-ngle/dist/src/summit_accel.c Thu Feb 20 13:53:48 2025
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $NetBSD: summit_accel.c,v 1.7 2025/02/18 12:17:20 macallan Exp $ */
+/* $NetBSD: summit_accel.c,v 1.8 2025/02/20 18:53:48 christos Exp $ */
#include <sys/types.h>
#include <dev/ic/summitreg.h>
@@ -484,8 +484,10 @@ SummitGlyphs (CARD8 op,
SummitWaitFifo(fPtr, 4);
NGLEWrite4(fPtr, VISFX_FOE, FOE_BLEND_ROP);
+#ifdef notyet
NGLEWrite4(fPtr, VISFX_IBO,
IBO_ADD | SRC(IBO_SRC) | DST(IBO_ONE_MINUS_SRC));
+#endif
while (nlist--) {
x += list->xOff;
