Attachment 35975 Details for Bug 25109 – Proposed fix

[patch] Proposed fix

0001-r300-compiler-Limit-the-number-of-TEX-blocks.patch (text/plain), 2.23 KB, created by Tom Stellard on 2010-05-31 14:23:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Stellard

Created: 2010-05-31 14:23:07 UTC

Size: 2.23 KB

patch

obsolete

>From db5d4d63e3e410fc678aa41df5ae71671ec7eb8e Mon Sep 17 00:00:00 2001
>From: Tom Stellard <tstellar@gmail.com>
>Date: Mon, 31 May 2010 11:54:13 -0700
>Subject: [PATCH] r300/compiler: Limit the number of TEX blocks.
>
>Modify the pair scheduler to emit all ready TEX instructions at once.
>This fixes bug:
>
>https://bugs.freedesktop.org/show_bug.cgi?id=25109
>---
> .../dri/r300/compiler/radeon_pair_schedule.c       |   39 +++++++++++++-------
> 1 files changed, 25 insertions(+), 14 deletions(-)
>
>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 a279549..0641be5 100644
>--- a/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
>+++ b/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
>@@ -208,21 +208,32 @@ static void emit_all_tex(struct schedule_state * s, struct rc_instruction * befo
> 
> 	assert(s->ReadyTEX);
> 
>-	/* Don't let the ready list change under us! */
>-	readytex = s->ReadyTEX;
>-	s->ReadyTEX = 0;
>-
>-	/* Node marker for R300 */
>-	struct rc_instruction * inst_begin = rc_insert_new_instruction(s->C, before->Prev);
>-	inst_begin->U.I.Opcode = RC_OPCODE_BEGIN_TEX;
>-
>-	/* Link texture instructions back in */
>-	while(readytex) {
>-		struct schedule_instruction * tex = readytex;
>-		readytex = readytex->NextReady;
>+	if(s->ReadyTEX){
>+		/* Node marker for R300 */
>+		struct rc_instruction * inst_begin =
>+				rc_insert_new_instruction(s->C, before->Prev);
>+		inst_begin->U.I.Opcode = RC_OPCODE_BEGIN_TEX;
>+	}
> 
>-		rc_insert_instruction(before->Prev, tex->Instruction);
>-		commit_instruction(s, tex);
>+	/* The purpose of this outer loop is to emit TEX instruction that
>+	 * have become ready as a result of the inner loop.  This prevents
>+	 * the fragmentation of TEX blocks, which for some shaders (in Civ4
>+	 * for example) was creating too many texture indirections on r300
>+	 * cards.
>+	 */
>+	while(s->ReadyTEX){
>+		/* Don't let the ready list change under us! */
>+		readytex = s->ReadyTEX;
>+		s->ReadyTEX = 0;
>+
>+		/* Link texture instructions back in */
>+		while(readytex) {
>+			struct schedule_instruction * tex = readytex;
>+			readytex = readytex->NextReady;
>+
>+			rc_insert_instruction(before->Prev, tex->Instruction);
>+			commit_instruction(s, tex);
>+		}
> 	}
> }
> 
>-- 
>1.6.4.4
>

Actions: View | Splinter Review

Attachments on bug 25109: 31221 | 31222 | 31223 | 35975 | 36026 | 36754

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.