Attachment 59289 Details for Bug 47418 – Align the row[index]

[patch] Align the row[index]

0001-sna-traps-Align-the-pointer-index.patch (text/plain), 1.95 KB, created by Chris Wilson on 2012-03-30 12:49:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2012-03-30 12:49:12 UTC

Size: 1.95 KB

patch

obsolete

>From 62863aa8c536a09472fddce3d99f7607d424fd87 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Fri, 30 Mar 2012 20:45:55 +0100
>Subject: [PATCH] sna/traps: Align the pointer+index
>
>It's the location of the pixels within the row that matter for
>alignment!
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47418
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> src/sna/sna_trapezoids.c |   26 +++++++++++++-------------
> 1 files changed, 13 insertions(+), 13 deletions(-)
>
>diff --git a/src/sna/sna_trapezoids.c b/src/sna/sna_trapezoids.c
>index b6c5b65..45bac1a 100644
>--- a/src/sna/sna_trapezoids.c
>+++ b/src/sna/sna_trapezoids.c
>@@ -1490,6 +1490,7 @@ inplace_row(struct active_list *active, uint8_t *row, int width)
> 
> 			if (rix > ++lix) {
> 				rix -= lix;
>+				row += lix;
> #if 0
> 				if (rix == 1)
> 					row[lix] = 0xff;
>@@ -1497,35 +1498,34 @@ inplace_row(struct active_list *active, uint8_t *row, int width)
> 					memset(row+lix, 0xff, rix);
> #else
> 				if ((uintptr_t)row & 1 && rix) {
>-					row[lix] = 0xff;
>-					lix++;
>+					*row++ = 0xff;
> 					rix--;
> 				}
> 				if ((uintptr_t)row & 2 && rix >= 2) {
>-					*(uint16_t *)(row+lix) = 0xffff;
>-					lix += 2;
>+					*(uint16_t *)row = 0xffff;
>+					row += 2;
> 					rix -= 2;
> 				}
> 				if ((uintptr_t)row & 4 && rix >= 4) {
>-					*(uint32_t *)(row+lix) = 0xffffffff;
>-					lix += 4;
>+					*(uint32_t *)row = 0xffffffff;
>+					row += 4;
> 					rix -= 4;
> 				}
> 				while (rix >= 8) {
>-					*(uint64_t *)(row+lix) = 0xffffffffffffffff;
>-					lix += 8;
>+					*(uint64_t *)row = 0xffffffffffffffff;
>+					row += 8;
> 					rix -= 8;
> 				}
> 				if (rix & 4) {
>-					*(uint32_t *)(row+lix) = 0xffffffff;
>-					lix += 4;
>+					*(uint32_t *)row = 0xffffffff;
>+					row += 4;
> 				}
> 				if (rix & 2) {
>-					*(uint16_t *)(row+lix) = 0xffff;
>-					lix += 2;
>+					*(uint16_t *)row = 0xffff;
>+					row += 2;
> 				}
> 				if (rix & 1)
>-					row[lix] = 0xff;
>+					*row = 0xff;
> #endif
> 			}
> 		}
>-- 
>1.7.9.1
>

Actions: View | Splinter Review

Attachments on bug 47418: 58574 | 58575 | 59289 | 59303

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.