From 500c0113f423bbae1b47be6f6a7141e559269ae8 Mon Sep 17 00:00:00 2001 From: Romain Dolbeau Date: Sat, 27 Aug 2022 10:21:27 +0200 Subject: [PATCH] byte-swap the FB --- .../external/mit/xf86-video-goblin/dist/src/goblin_accel.c | 4 ++-- .../external/mit/xf86-video-goblin/dist/src/goblin_driver.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/NetBSD/9.0/usr/xsrc/external/mit/xf86-video-goblin/dist/src/goblin_accel.c b/NetBSD/9.0/usr/xsrc/external/mit/xf86-video-goblin/dist/src/goblin_accel.c index 6847e93..6ffbe5b 100644 --- a/NetBSD/9.0/usr/xsrc/external/mit/xf86-video-goblin/dist/src/goblin_accel.c +++ b/NetBSD/9.0/usr/xsrc/external/mit/xf86-video-goblin/dist/src/goblin_accel.c @@ -45,7 +45,7 @@ #else #define ENTER #define DPRINTF while (0) xf86Msg -#define RPRINTF while (0) xf86Msg +#define RPRINTF xf86Msg #endif #define arraysize(ary) (sizeof(ary) / sizeof(ary[0])) @@ -838,7 +838,7 @@ static void GoblinComposite(PixmapPtr pDst, int srcX, int srcY, int maskX, int m pGoblin->jreg->reg_msk_ptr = 0; if (pGoblin->source_is_solid) { - pGoblin->jreg->reg_fgcolor = flip ? __builtin_bswap32(pGoblin->fillcolour) : pGoblin->fillcolour; // CHECKME + pGoblin->jreg->reg_fgcolor = __builtin_bswap32(pGoblin->fillcolour); switch (pGoblin->mskformat) { case PICT_a8: RPRINTF(X_INFO, "%s: %d: Starting PictOpOver: %d x %d, flip %d, %d x %d (+0x%08x)-> %d x %d (+0x%08x), fg 0x%08x\n", __func__, __LINE__, diff --git a/NetBSD/9.0/usr/xsrc/external/mit/xf86-video-goblin/dist/src/goblin_driver.c b/NetBSD/9.0/usr/xsrc/external/mit/xf86-video-goblin/dist/src/goblin_driver.c index 3bcd549..0a96561 100644 --- a/NetBSD/9.0/usr/xsrc/external/mit/xf86-video-goblin/dist/src/goblin_driver.c +++ b/NetBSD/9.0/usr/xsrc/external/mit/xf86-video-goblin/dist/src/goblin_driver.c @@ -423,8 +423,9 @@ GOBLINPreInit(ScrnInfoPtr pScrn, int flags) */ if (pScrn->depth > 8) { rgb weight = {0, 0, 0}; - rgb mask = {0xff, 0xff00, 0xff0000}; - + //rgb mask = {0xff, 0xff00, 0xff0000}; + rgb mask = {0xff0000, 0xff00, 0xff}; + if (!xf86SetWeight(pScrn, weight, mask)) { return FALSE; }