From owner-p4-projects@FreeBSD.ORG  Mon May 27 15:22:11 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 33EBB93; Mon, 27 May 2013 15:22:11 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id E528C91
 for <perforce@freebsd.org>; Mon, 27 May 2013 15:22:10 +0000 (UTC)
 (envelope-from prw35@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id BB7799B1
 for <perforce@freebsd.org>; Mon, 27 May 2013 15:22:10 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r4RFMAqa029185
 for <perforce@freebsd.org>; Mon, 27 May 2013 15:22:10 GMT
 (envelope-from prw35@FreeBSD.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r4RFMA6o029182
 for perforce@freebsd.org; Mon, 27 May 2013 15:22:10 GMT
 (envelope-from prw35@FreeBSD.org)
Date: Mon, 27 May 2013 15:22:10 GMT
Message-Id: <201305271522.r4RFMA6o029182@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 prw35@FreeBSD.org using -f
From: Philip Withnall <prw35@FreeBSD.org>
Subject: PERFORCE change 229058 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 May 2013 15:22:11 -0000

http://p4web.freebsd.org/@@229058?ac=10

Change 229058 by prw35@pwithnall_zenith on 2013/05/27 15:21:22

	compositorctl: Fix width of image during initialisation
	
	Ensure that the excess due to the row stride is filled with alpha.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/ctsrd/compositorctl/compositorctl.c#2 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/ctsrd/compositorctl/compositorctl.c#2 (text+ko) ====

@@ -37,6 +37,7 @@
 #include <sys/endian.h>
 #include <sys/ioccom.h>
 #include <sys/mman.h>
+#include <sys/param.h>
 #include <sys/types.h>
 #include <unistd.h>
 
@@ -751,7 +752,7 @@
 	struct compositor_mapping secure_compositor;
 	int retval = 0;
 	struct compositor_rgba_pixel overlay_bg_colour = {
-		.red = 0, .green = 0xff, .blue = 0, .alpha = 0xa0
+		.red = 0, .green = 0xa0, .blue = 0, .alpha = 0xa0
 	};
 	struct compositor_rgba_pixel overlay_border_colour = {
 		.red = 0, .green = 0xff, .blue = 0xff, .alpha = 0xff
@@ -845,7 +846,8 @@
 	printf("Writing crest tile data…\n");
 
 	compositor_write_cfb_data_image(crest_cfb_id,
-	                                crest_image.width, crest_image.height,
+	                                ROUND_UP(crest_image.width, TILE_SIZE),
+	                                ROUND_UP(crest_image.height, TILE_SIZE),
 	                                crest_image.width, crest_image.height,
 	                                (const uint32_t *) ((const void *) crest_image.pixel_data));
 
@@ -913,11 +915,19 @@
 		}
 
 		/* Change the colours for the next one. */
-		overlay_bg_colour.red += 0x30;
-		overlay_bg_colour.green -= 0x30;
 		overlay_bg_colour.alpha -= 0x20;
-		overlay_border_colour.red += 0x30;
-		overlay_border_colour.green -= 0x30;
+		overlay_bg_colour.red =
+			MIN(overlay_bg_colour.alpha,
+			    overlay_bg_colour.red + 0x30);
+		overlay_bg_colour.green =
+			MIN(overlay_bg_colour.alpha,
+			    overlay_bg_colour.green - 0x30);
+		overlay_border_colour.red =
+			MIN(overlay_border_colour.alpha,
+			    overlay_border_colour.red + 0x30);
+		overlay_border_colour.green =
+			MIN(overlay_border_colour.alpha,
+			    overlay_border_colour.green - 0x30);
 	}