diff options
| author | Nicolai Haehnle <nhaehnle@gmail.com> | 2008-07-12 21:13:03 +0200 |
|---|---|---|
| committer | Nicolai Haehnle <nhaehnle@gmail.com> | 2008-07-12 21:16:16 +0200 |
| commit | e81ba58bf4c20229677cdf89b5970b55cefb2199 (patch) | |
| tree | e3a34f2db1ee2e0feb10c76c05f3f6f6cf4b50ed /src/mesa/drivers/dri/r300/radeon_program_pair.c | |
| parent | 3b8081603bf846285e56a6ecafaf182935fd8733 (diff) | |
r300_fragprog: Use nqssa+dce and program_pair for emit
Share almost all code with r500_fragprog now.
This also fixes Piglit's texrect-many test, which means that the compiz
bicubic plugin should work with hardware acceleration now.
Diffstat (limited to 'src/mesa/drivers/dri/r300/radeon_program_pair.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/radeon_program_pair.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r300/radeon_program_pair.c b/src/mesa/drivers/dri/r300/radeon_program_pair.c index 85ddf1dc50..8762422801 100644 --- a/src/mesa/drivers/dri/r300/radeon_program_pair.c +++ b/src/mesa/drivers/dri/r300/radeon_program_pair.c @@ -578,6 +578,9 @@ static void emit_all_tex(struct pair_state *s) if (s->Debug) _mesa_printf(" BEGIN_TEX\n"); + if (s->Handler->BeginTexBlock) + s->Error = s->Error || !s->Handler->BeginTexBlock(s->UserData); + for(pairinst = readytex; pairinst; pairinst = pairinst->NextReady) { int ip = pairinst - s->Instructions; struct prog_instruction *inst = s->Program->Instructions + ip; @@ -594,9 +597,6 @@ static void emit_all_tex(struct pair_state *s) s->Error = s->Error || !s->Handler->EmitTex(s->UserData, inst); } - if (s->Handler->EndTexBlock) - s->Handler->EndTexBlock(s->UserData); - if (s->Debug) _mesa_printf(" END_TEX\n"); } |