Attachment 42514 Details for Bug 31830 – Disable instruction rewriting in the scheduler

[patch] Disable instruction rewriting in the scheduler

disable-sched-rewrite.diff (text/plain), 1.56 KB, created by Tom Stellard on 2011-01-26 01:11:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Stellard

Created: 2011-01-26 01:11:35 UTC

Size: 1.56 KB

patch

obsolete

>diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c b/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
>index 9beb5d6..c97ba77 100644
>--- a/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
>+++ b/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
>@@ -769,7 +769,6 @@ static void emit_one_alu(struct schedule_state *s, struct rc_instruction * befor
> 	} else {
> 		struct schedule_instruction **prgb;
> 		struct schedule_instruction **palpha;
>-		struct schedule_instruction *prev;
> pair:
> 		/* Some pairings might fail because they require too
> 		 * many source slots; try all possible pairings if necessary */
>@@ -789,31 +788,6 @@ pair:
> 				goto success;
> 			}
> 		}
>-		prev = NULL;
>-		/* No success in pairing, now try to convert one of the RGB
>-		 * instructions to an Alpha so we can pair it with another RGB.
>-		 */
>-		if (s->ReadyRGB && s->ReadyRGB->NextReady) {
>-		for(prgb = &s->ReadyRGB; *prgb; prgb = &(*prgb)->NextReady) {
>-			if ((*prgb)->NumWriteValues == 1) {
>-				struct schedule_instruction * prgb_next;
>-				if (!convert_rgb_to_alpha(s, *prgb))
>-					goto cont_loop;
>-				prgb_next = (*prgb)->NextReady;
>-				/* Add instruction to the Alpha ready list. */
>-				(*prgb)->NextReady = s->ReadyAlpha;
>-				s->ReadyAlpha = *prgb;
>-				/* Remove instruction from the RGB ready list.*/
>-				if (prev)
>-					prev->NextReady = prgb_next;
>-				else
>-					s->ReadyRGB = prgb_next;
>-				goto pair;
>-			}
>-cont_loop:
>-			prev = *prgb;
>-		}
>-		}
> 		/* Still no success in pairing, just take the first RGB
> 		 * or alpha instruction. */
> 		if (s->ReadyRGB) {

Actions: View | Splinter Review

Attachments on bug 31830: 40467 | 40468 | 42355 | 42514 | 42516 | 42626 | 42627

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.