From e7509d40ca66555c92cbd1c57e607b78f1b53022 Mon Sep 17 00:00:00 2001
From: Romain Dolbeau <romain@dolbeau.org>
Date: Sun, 21 Aug 2022 15:20:44 +0200
Subject: [PATCH] more bugfixes for EXA

---
 .../xf86-video-goblin/dist/src/goblin_accel.c | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 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 16e29a0..5fb2ca5 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
@@ -820,7 +820,7 @@ static void GoblinComposite(PixmapPtr pDst, int srcX, int srcY, int maskX, int m
 	switch (pGoblin->op) {
 	case PictOpOver: {
 		GoblinWait(pGoblin);
-		pGoblin->jreg->reg_op = (0x80 | PictOpOver | ((flip && !pGoblin->source_is_solid) ? 0x40 : 0)); // xrender operation
+		//pGoblin->jreg->reg_op = (0x80 | PictOpOver | ((flip && !pGoblin->source_is_solid) ? 0x40 : 0)); // xrender operation
 		pGoblin->jreg->reg_depth = 0; // or 32 ?
 		pGoblin->jreg->reg_width = width;
 		pGoblin->jreg->reg_height = height;
@@ -862,6 +862,7 @@ static void GoblinComposite(PixmapPtr pDst, int srcX, int srcY, int maskX, int m
 						/* 	RPRINTF(X_INFO, "\n"); */
 						/* } */
 						
+				pGoblin->jreg->reg_op = (0x80 | PictOpOver);
 				pGoblin->jreg->reg_cmd = 8; // 1<<DO_RSMSK8DST32_BIT
 				
 	/* 					RPRINTF(X_INFO, "%s: %d: after:\n", __func__, __LINE__); */
@@ -904,15 +905,16 @@ static void GoblinComposite(PixmapPtr pDst, int srcX, int srcY, int maskX, int m
 						/* 	RPRINTF(X_INFO, "\n"); */
 						/* } */
 					
-				if ((pGoblin->srcoff != pGoblin->mskoff) ||
-					(srcX != maskX) ||
-					(srcY != maskY) ||
-					(pGoblin->srcpitch != pGoblin->mskpitch)) {
-					pGoblin->jreg->reg_cmd = 0x10; // 1<<DO_RSRC32MSK32DST32_BIT
-				} else {
-					// mask is just src
-					pGoblin->jreg->reg_cmd = 0x20; // 1<<DO_RSRC32DST32_BIT
-				}
+					pGoblin->jreg->reg_op = (0x80 | PictOpOver | (flip ? 0x40 : 0));
+					if ((pGoblin->srcoff != pGoblin->mskoff) ||
+						(srcX != maskX) ||
+						(srcY != maskY) ||
+						(pGoblin->srcpitch != pGoblin->mskpitch)) {
+						pGoblin->jreg->reg_cmd = 0x10; // 1<<DO_RSRC32MSK32DST32_BIT
+					} else {
+						// mask is just src
+						pGoblin->jreg->reg_cmd = 0x20; // 1<<DO_RSRC32DST32_BIT
+					}
 				
 	/* 					RPRINTF(X_INFO, "%s: %d: after:\n", __func__, __LINE__); */
 	/* GoblinWait(pGoblin); */
@@ -962,6 +964,7 @@ static void GoblinComposite(PixmapPtr pDst, int srcX, int srcY, int maskX, int m
 						/* 	RPRINTF(X_INFO, "\n"); */
 						/* } */
 						
+				pGoblin->jreg->reg_op = (0x80 | PictOpOver | (flip ? 0x40 : 0));
 				if ((pGoblin->srcoff != pGoblin->mskoff) ||
 					(srcX != maskX) ||
 					(srcY != maskY) ||