Series is Reviewed-by: Jason Ekstrand <[email protected]>
I don't care much about the squashing as long as the whole thing builds. It's all dead anyway. Note: I believe Eric merged tgsi_to_nir, so this patch will have to delete even more code. :-) --Jason On Wed, Apr 1, 2015 at 6:36 PM, Matt Turner <[email protected]> wrote: > --- > src/glsl/nir/nir_opcodes.py | 2 -- > src/mesa/drivers/dri/i965/brw_fs_nir.cpp | 2 -- > 2 files changed, 4 deletions(-) > > diff --git a/src/glsl/nir/nir_opcodes.py b/src/glsl/nir/nir_opcodes.py > index 062cd62..87f06d1 100644 > --- a/src/glsl/nir/nir_opcodes.py > +++ b/src/glsl/nir/nir_opcodes.py > @@ -191,8 +191,6 @@ unop("fround_even", tfloat, "_mesa_roundevenf(src0)") > > unop("fsin", tfloat, "sinf(src0)") > unop("fcos", tfloat, "cosf(src0)") > -unop("fsin_reduced", tfloat, "sinf(src0)") > -unop("fcos_reduced", tfloat, "cosf(src0)") > > > # Partial derivatives. > diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp > b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp > index 4dfb4d6..832fbad 100644 > --- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp > +++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp > @@ -889,13 +889,11 @@ fs_visitor::nir_emit_alu(nir_alu_instr *instr) > unreachable("not reached: should be handled by ir_explog_to_explog2"); > > case nir_op_fsin: > - case nir_op_fsin_reduced: > inst = emit_math(SHADER_OPCODE_SIN, result, op[0]); > inst->saturate = instr->dest.saturate; > break; > > case nir_op_fcos: > - case nir_op_fcos_reduced: > inst = emit_math(SHADER_OPCODE_COS, result, op[0]); > inst->saturate = instr->dest.saturate; > break; > -- > 2.0.5 > > _______________________________________________ > mesa-dev mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
