Wed Apr 24 11:42:06 2024 UTC (15d)

don't enable xrender support unless we have 24bit colour


(macallan)

diff -r1.20 -r1.21 xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c

--- xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c 2023/01/08 22:03:02	1.20
+++ xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c 2024/04/24 11:42:06	1.21

 @@ -385,26 +385,32 @@ CG14PreInit(ScrnInfoPtr pScrn, int flags
     xf86CollectOptions(pScrn, NULL);
     /* Process the options */
     if (!(pCg14->Options = malloc(sizeof(CG14Options))))
 	return FALSE;
     memcpy(pCg14->Options, CG14Options, sizeof(CG14Options));
     xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pCg14->Options);
     pCg14->use_shadow = xf86ReturnOptValBool(pCg14->Options, OPTION_SHADOW_FB,
         TRUE);
     pCg14->use_accel = xf86ReturnOptValBool(pCg14->Options, OPTION_ACCEL,
         TRUE);
     pCg14->use_xrender = xf86ReturnOptValBool(pCg14->Options, OPTION_XRENDER,
         FALSE);
     if (pScrn->depth < 24) {
 	if (pCg14->use_xrender)
 	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disabling xrender on depth < 24\n");
 	pCg14->use_xrender = FALSE;
+    }
     /*
      * This must happen after pScrn->display has been set because
      * xf86SetWeight references it.
      */
     if (pScrn->depth > 8) {
 	rgb weight = {0, 0, 0};
 	rgb mask = {0xff, 0xff00, 0xff0000};
 	if (!xf86SetWeight(pScrn, weight, mask)) {
 	    return FALSE;
+	}
+    }