From 6a9b29116b80411dad96f80c00f348c50e54d763 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Tue, 11 Jul 2000 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2000-07-11

---
 alphapc/screen.c | 3 ++-
 pc/screen.c      | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/alphapc/screen.c b/alphapc/screen.c
index 673b6a2326e54fd346b02538b70c08019a0e5e70..be2bc5c4fad25d839a4c28407534c4415414b149 100644
--- a/alphapc/screen.c
+++ b/alphapc/screen.c
@@ -497,7 +497,8 @@ hwdraw(Memdrawparam *par)
 	 * pixel we can convert to the destination format and just
 	 * replicate with memset.
 	 */
-	if(scr->fill && (par->state&(Simplemask|Simplesrc|Fullmask))==(Simplemask|Simplesrc|Fullmask))
+	m = Simplesrc|Simplemask|Fullmask;
+	if(scr->fill && (par->state&m)==m && ((par->srgba&0xFF) == 0xFF))
 		return scr->fill(scr, par->r, par->sdval);
 
 	/*
diff --git a/pc/screen.c b/pc/screen.c
index 290fc4393dd90215b13c45610a616f9869c5a09f..04fdd11ce58d5a60419536e8471de767a4be3f46 100644
--- a/pc/screen.c
+++ b/pc/screen.c
@@ -470,6 +470,7 @@ hwdraw(Memdrawparam *par)
 {
 	VGAscr *scr;
 	Memimage *dst, *src;
+	int m;
 
 	if(hwaccel == 0)
 		return 0;
@@ -496,7 +497,8 @@ hwdraw(Memdrawparam *par)
 	 * pixel we can convert to the destination format and just
 	 * replicate with memset.
 	 */
-	if(scr->fill && (par->state&(Simplemask|Simplesrc|Fullmask))==(Simplemask|Simplesrc|Fullmask))
+	m = Simplesrc|Simplemask|Fullmask;
+	if(scr->fill && (par->state&m)==m && ((par->srgba&0xFF) == 0xFF))
 		return scr->fill(scr, par->r, par->sdval);
 
 	/*