summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--progs/glsl/CH06-brick.frag.txt6
-rw-r--r--src/mesa/drivers/dri/i965/brw_wm_glsl.c6
2 files changed, 5 insertions, 7 deletions
diff --git a/progs/glsl/CH06-brick.frag.txt b/progs/glsl/CH06-brick.frag.txt
index 388c5f9e660..06ef04e3afb 100644
--- a/progs/glsl/CH06-brick.frag.txt
+++ b/progs/glsl/CH06-brick.frag.txt
@@ -23,11 +23,7 @@ void main()
position = MCposition / BrickSize;
-// if (fract(position.y * 0.5) > 0.5)
-// position.x += 0.5;
- float tmp;
- tmp = fract(position.y * 0.5);
- if (tmp > 0.5)
+ if (fract(position.y * 0.5) > 0.5)
position.x += 0.5;
position = fract(position);
diff --git a/src/mesa/drivers/dri/i965/brw_wm_glsl.c b/src/mesa/drivers/dri/i965/brw_wm_glsl.c
index 4988df2b0e4..09e75903676 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_glsl.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_glsl.c
@@ -811,18 +811,20 @@ static void emit_sop(struct brw_wm_compile *c,
struct brw_reg dst, src0, src1;
int i;
+ brw_push_insn_state(p);
for (i = 0; i < 4; i++) {
if (mask & (1<<i)) {
dst = get_dst_reg(c, inst, i, 1);
src0 = get_src_reg(c, &inst->SrcReg[0], i, 1);
src1 = get_src_reg(c, &inst->SrcReg[1], i, 1);
- brw_MOV(p, dst, brw_imm_f(0));
brw_CMP(p, brw_null_reg(), cond, src0, src1);
+ brw_set_predicate_control(p, BRW_PREDICATE_NONE);
+ brw_MOV(p, dst, brw_imm_f(0.0));
brw_set_predicate_control(p, BRW_PREDICATE_NORMAL);
brw_MOV(p, dst, brw_imm_f(1.0));
- brw_set_predicate_control_flag_value(p, 0xff);
}
}
+ brw_pop_insn_state(p);
}
static void emit_slt(struct brw_wm_compile *c,