summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Amsler <[email protected]>2008-05-06 01:32:40 +0200
committerMarkus Amsler <[email protected]>2008-05-06 01:32:40 +0200
commit113f5b14cbab2d62d5ca470f4b1f82989d3a50fe (patch)
tree82072a2a8e137c0bd4a2b193cc6fa82e0f6711a7
parentcc77e8f1131fc66e8405dc4d3b03582db1f54ca4 (diff)
r300: fragment.position input needs no blanking out, it's correctly handled in insert_wpos.
fixes bug 15447
-rw-r--r--src/mesa/drivers/dri/r300/r300_vertprog.c6
1 files changed, 3 insertions, 3 deletions
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);