fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 15:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

i956: Make new FS discard do its work in a temp, not the null reg!

Browse source 
Fixes:
glsl-fs-discard-02 (GPU hang)
glsl1-discard statement (2)
This commit is contained in:
Eric Anholt 2010-09-29 15:48:21 -07:00
parent 3da98c1ca5
commit 0efea25c4b
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/mesa/drivers/dri/i965/brw_fs.cpp
View file

@ -450,7 +450,7 @@ public:
struct brw_reg *src); struct brw_reg *src);
void generate_tex(fs_inst *inst, struct brw_reg dst, struct brw_reg src); void generate_tex(fs_inst *inst, struct brw_reg dst, struct brw_reg src);
void generate_math(fs_inst *inst, struct brw_reg dst, struct brw_reg *src); void generate_math(fs_inst *inst, struct brw_reg dst, struct brw_reg *src);
void generate_discard(fs_inst *inst); void generate_discard(fs_inst *inst, struct brw_reg temp);
void generate_ddx(fs_inst *inst, struct brw_reg dst, struct brw_reg src); void generate_ddx(fs_inst *inst, struct brw_reg dst, struct brw_reg src);
void generate_ddy(fs_inst *inst, struct brw_reg dst, struct brw_reg src); void generate_ddy(fs_inst *inst, struct brw_reg dst, struct brw_reg src);
@ -1276,9 +1276,11 @@ fs_visitor::visit(ir_swizzle *ir)
void void
fs_visitor::visit(ir_discard *ir) fs_visitor::visit(ir_discard *ir)
{ {
fs_reg temp = fs_reg(this, glsl_type::uint_type);
assert(ir->condition == NULL); /* FINISHME */ assert(ir->condition == NULL); /* FINISHME */
emit(fs_inst(FS_OPCODE_DISCARD)); emit(fs_inst(FS_OPCODE_DISCARD, temp, temp));
} }
void void
@ -1884,13 +1886,15 @@ fs_visitor::generate_ddy(fs_inst *inst, struct brw_reg dst, struct brw_reg src)
} }
void void
fs_visitor::generate_discard(fs_inst *inst) fs_visitor::generate_discard(fs_inst *inst, struct brw_reg temp)
{ {
struct brw_reg g0 = retype(brw_vec1_grf(0, 0), BRW_REGISTER_TYPE_UW); struct brw_reg g0 = retype(brw_vec1_grf(0, 0), BRW_REGISTER_TYPE_UW);
temp = brw_uw1_reg(temp.file, temp.nr, 0);
brw_push_insn_state(p); brw_push_insn_state(p);
brw_set_mask_control(p, BRW_MASK_DISABLE); brw_set_mask_control(p, BRW_MASK_DISABLE);
brw_NOT(p, c->emit_mask_reg, brw_mask_reg(1)); /* IMASK */ brw_NOT(p, temp, brw_mask_reg(1)); /* IMASK */
brw_AND(p, g0, c->emit_mask_reg, g0); brw_AND(p, g0, temp, g0);
brw_pop_insn_state(p); brw_pop_insn_state(p);
} }
@ -2182,7 +2186,7 @@ fs_visitor::generate_code()
generate_tex(inst, dst, src[0]); generate_tex(inst, dst, src[0]);
break; break;
case FS_OPCODE_DISCARD: case FS_OPCODE_DISCARD:
generate_discard(inst); generate_discard(inst, dst /* src0 == dst */);
break; break;
case FS_OPCODE_DDX: case FS_OPCODE_DDX:
generate_ddx(inst, dst, src[0]); generate_ddx(inst, dst, src[0]);