Module Name: src
Committed By: phx
Date: Tue Feb 7 18:48:20 UTC 2012
Modified Files:
src/sys/dev/wsfb: genfb.c
Log Message:
On 8-bit screens only enable font anti-aliasing when the cmap_callback
property is defined. It is needed for a suitable R3G3B2 color map.
Ok by releng@
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/wsfb/genfb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wsfb/genfb.c
diff -u src/sys/dev/wsfb/genfb.c:1.46 src/sys/dev/wsfb/genfb.c:1.47
--- src/sys/dev/wsfb/genfb.c:1.46 Wed Jan 11 16:13:11 2012
+++ src/sys/dev/wsfb/genfb.c Tue Feb 7 18:48:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb.c,v 1.46 2012/01/11 16:13:11 macallan Exp $ */
+/* $NetBSD: genfb.c,v 1.47 2012/02/07 18:48:19 phx Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.46 2012/01/11 16:13:11 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.47 2012/02/07 18:48:19 phx Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -510,7 +510,7 @@ genfb_init_screen(void *cookie, struct v
if (ri->ri_depth == 32)
ri->ri_flg |= RI_ENABLE_ALPHA;
- if (ri->ri_depth == 8)
+ if (ri->ri_depth == 8 && sc->sc_cmcb != NULL)
ri->ri_flg |= RI_ENABLE_ALPHA | RI_8BIT_IS_RGB;