i965: move the fetch_constants() call before setting conditional mod state

Before, the instruction's CondUpdate field was mistakenly effecting the
constant-fetch operation.

Fixes progs/glsl/bump.c demo.  But there are some other issues related
to condition flags and IF/ELSE that need investigation...
This commit is contained in:
Brian Paul
2009-04-08 13:48:34 -06:00
parent f4468384b6
commit ed9ba19bbb
+4 -4
View File
@@ -2620,6 +2620,10 @@ static void brw_wm_emit_glsl(struct brw_context *brw, struct brw_wm_compile *c)
for (i = 0; i < c->nr_fp_insns; i++) {
struct prog_instruction *inst = &c->prog_instructions[i];
/* fetch any constants that this instruction needs */
if (c->use_const_buffer)
fetch_constants(c, inst);
if (inst->CondUpdate)
brw_set_conditionalmod(p, BRW_CONDITIONAL_NZ);
else
@@ -2630,10 +2634,6 @@ static void brw_wm_emit_glsl(struct brw_context *brw, struct brw_wm_compile *c)
_mesa_print_instruction(inst);
*/
/* fetch any constants that this instruction needs */
if (c->use_const_buffer)
fetch_constants(c, inst);
switch (inst->Opcode) {
case WM_PIXELXY:
emit_pixel_xy(c, inst);