Attachment 15944 Details for Bug 15525 – fix fragment.position

[patch] fix fragment.position

0001-r300-Fragment.position-input-needs-no-blanking-out.patch (text/plain), 1.96 KB, created by Markus Amsler on 2008-04-15 15:46:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Amsler

Created: 2008-04-15 15:46:59 UTC

Size: 1.96 KB

patch

obsolete

>From 6c66f80c4e9302903d02c9c634954bb6be0ed7f7 Mon Sep 17 00:00:00 2001
>From: Markus Amsler <markus.amsler@oribi.org>
>Date: Fri, 11 Apr 2008 13:09:00 +0200
>Subject: [PATCH] r300: Fragment.position input needs no blanking out, as it's correctly handled in insert_wpos.
>To: <mesa3d-dev@lists.sourceforge.net>
>
>Fixes Bug 15447
>---
> src/mesa/drivers/dri/r300/r300_vertprog.c |   30 +++++++++++++++-------------
> 1 files changed, 16 insertions(+), 14 deletions(-)
>
>diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.c b/src/mesa/drivers/dri/r300/r300_vertprog.c
>index e91d968..dfb748b 100644
>--- a/src/mesa/drivers/dri/r300/r300_vertprog.c
>+++ b/src/mesa/drivers/dri/r300/r300_vertprog.c
>@@ -1428,20 +1428,6 @@ void r300SelectVertexShader(r300ContextPtr r300)
> 	vpc = (struct r300_vertex_program_cont *)ctx->VertexProgram._Current;
> 	InputsRead = ctx->FragmentProgram._Current->Base.InputsRead;
> 
>-	wpos_idx = -1;
>-	if (InputsRead & FRAG_BIT_WPOS) {
>-		for (i = 0; i < ctx->Const.MaxTextureUnits; i++)
>-			if (!(InputsRead & (FRAG_BIT_TEX0 << i)))
>-				break;
>-
>-		if (i == ctx->Const.MaxTextureUnits) {
>-			fprintf(stderr, "\tno free texcoord found\n");
>-			_mesa_exit(-1);
>-		}
>-
>-		InputsRead |= (FRAG_BIT_TEX0 << i);
>-		wpos_idx = i;
>-	}
> 	wanted_key.InputsRead = vpc->mesa_program.Base.InputsRead;
> 	wanted_key.OutputsWritten = vpc->mesa_program.Base.OutputsWritten;
> 
>@@ -1461,6 +1447,22 @@ void r300SelectVertexShader(r300ContextPtr r300)
> 		}
> 	}
> 
>+	wpos_idx = -1;
>+	if (InputsRead & FRAG_BIT_WPOS) {
>+		for (i = 0; i < ctx->Const.MaxTextureUnits; i++)
>+			if (!(InputsRead & (FRAG_BIT_TEX0 << i)))
>+				break;
>+
>+		if (i == ctx->Const.MaxTextureUnits) {
>+			fprintf(stderr, "\tno free texcoord found\n");
>+			_mesa_exit(-1);
>+		}
>+
>+		InputsRead |= (FRAG_BIT_TEX0 << i);
>+		wanted_key.OutputsWritten |= 1 << (VERT_RESULT_TEX0 + i);
>+		wpos_idx = i;
>+	}
>+
> 	if (vpc->mesa_program.IsPositionInvariant) {
> 		/* we wan't position don't we ? */
> 		wanted_key.InputsRead |= (1 << VERT_ATTRIB_POS);
>-- 
>1.5.5
>

Actions: View | Splinter Review

Attachments on bug 15525: 15944

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.