r300_fragprog: Use nqssa+dce and program_pair for emit

[mesa.git] / src / mesa / drivers / dri / r300 / radeon_program_pair.c

diff --git a/src/mesa/drivers/dri/r300/radeon_program_pair.c b/src/mesa/drivers/dri/r300/radeon_program_pair.c
index 85ddf1dc50e9fe7b865a2455af6526b8f85ce1db..8762422801eb03701039a3b56dc4c2158232a80b 100644 (file)
--- 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");
 }