summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrice Mandin <patrice@manoir.racoon.city>2007-01-14 19:56:30 +0100
committerPatrice Mandin <patrice@manoir.racoon.city>2007-01-14 19:56:30 +0100
commiteae7acac168d4e5472488a9135aba0b4e081d5e8 (patch)
tree5b9c7589dc54dec45e4411ff0b34909fcc9222ac
parent8aabd636f5dd303774a07f8705068d812f7feef8 (diff)
parent9a4e49aef2abb277544138640c2b71169badaa42 (diff)
Merge branch 'master' of git+ssh://pmandin@git.freedesktop.org/git/mesa/mesa
-rw-r--r--src/mesa/drivers/dri/r300/r300_vertexprog.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_vertexprog.c b/src/mesa/drivers/dri/r300/r300_vertexprog.c
index 2492a4a3a0..c08c98767e 100644
--- a/src/mesa/drivers/dri/r300/r300_vertexprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertexprog.c
@@ -1072,6 +1072,8 @@ static void insert_wpos(struct r300_vertex_program *vp,
vpi = &prog->Instructions[prog->NumInstructions-1];
assert(vpi->Opcode == OPCODE_END);
+ /* we need position, don't we ? :) */
+ prog->InputsRead |= (1 << VERT_ATTRIB_POS);
}
static void pos_as_texcoord(struct r300_vertex_program *vp,
@@ -1101,8 +1103,9 @@ static struct r300_vertex_program *build_program(struct r300_vertex_program_key
vp->wpos_idx = wpos_idx;
- if(mesa_vp->IsPositionInvariant)
+ if(mesa_vp->IsPositionInvariant) {
position_invariant(&mesa_vp->Base);
+ }
if(wpos_idx > -1)
pos_as_texcoord(vp, &mesa_vp->Base);
@@ -1158,6 +1161,10 @@ void r300_select_vertex_shader(r300ContextPtr r300)
wanted_key.OutputsWritten |= 1 << (VERT_RESULT_TEX0 + i);
wanted_key.InputsRead = vpc->mesa_program.Base.InputsRead;
+ if(vpc->mesa_program.IsPositionInvariant) {
+ /* we wan't position don't we ? */
+ wanted_key.InputsRead |= (1 << VERT_ATTRIB_POS);
+ }
for (vp = vpc->progs; vp; vp = vp->next)
if (_mesa_memcmp(&vp->key, &wanted_key, sizeof(wanted_key)) == 0) {
@@ -1170,6 +1177,5 @@ void r300_select_vertex_shader(r300ContextPtr r300)
vp = build_program(&wanted_key, &vpc->mesa_program, wpos_idx);
vp->next = vpc->progs;
vpc->progs = vp;
-
r300->selected_vp = vp;
}