From: Markus Amsler <markus.amsler@oribi.org>
Date: Mon, 5 May 2008 23:32:40 +0000 (+0200)
Subject: r300: fragment.position input needs no blanking out, it's correctly handled in insert... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=113f5b14cbab2d62d5ca470f4b1f82989d3a50fe;p=mesa.git

r300: fragment.position input needs no blanking out, it's correctly handled in insert_wpos.

fixes bug 15447
---

diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.c b/src/mesa/drivers/dri/r300/r300_vertprog.c
index e91d96852db..861f0427cf5 100644
--- a/src/mesa/drivers/dri/r300/r300_vertprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.c
@@ -1426,6 +1426,8 @@ void r300SelectVertexShader(r300ContextPtr r300)
 	GLint wpos_idx;
 
 	vpc = (struct r300_vertex_program_cont *)ctx->VertexProgram._Current;
+	wanted_key.InputsRead = vpc->mesa_program.Base.InputsRead;
+	wanted_key.OutputsWritten = vpc->mesa_program.Base.OutputsWritten;
 	InputsRead = ctx->FragmentProgram._Current->Base.InputsRead;
 
 	wpos_idx = -1;
@@ -1439,11 +1441,9 @@ void r300SelectVertexShader(r300ContextPtr r300)
 			_mesa_exit(-1);
 		}
 
-		InputsRead |= (FRAG_BIT_TEX0 << i);
+		wanted_key.OutputsWritten |= 1 << (VERT_RESULT_TEX0 + i);
 		wpos_idx = i;
 	}
-	wanted_key.InputsRead = vpc->mesa_program.Base.InputsRead;
-	wanted_key.OutputsWritten = vpc->mesa_program.Base.OutputsWritten;
 
 	add_outputs(&wanted_key, VERT_RESULT_HPOS);