On Wednesday, November 12, 2014 09:57:30 PM Matt Turner wrote: > On Wed, Nov 12, 2014 at 9:35 PM, Kenneth Graunke <kenn...@whitecape.org> wrote: > > +vec4_visitor::emit_math(enum opcode opcode, > > + dst_reg dst, src_reg src0, src_reg src1) > > I think you can make the arguments const references too?
Yeah. I've changed the prototype to: void emit_math(enum opcode opcode, const dst_reg &dst, const src_reg &src0, const src_reg &src1 = src_reg()); It also meant changing the first few lines to: vec4_instruction *math = emit(opcode, dst, fix_math_operand(src0), fix_math_operand(src1)) since "src0 = fix_math_operand(src0)" doesn't work with "const src_reg &". > > + if (brw->gen == 6 && dst.writemask != WRITEMASK_XYZW) { > > + /* MATH on Gen6 must be align1, so we can't do writemasks. */ > > + math->dst = dst_reg(this, glsl_type::vec4_type); > > + math->dst.type = dst.type; > > + math->dst.writemask = WRITEMASK_XYZW; > > I don't think you need to set the writemask (XYZW is the default). I do, actually - it's guaranteed to not be XYZW at this point. The caller passed us a destination register with some writemask set. We create the "math" instruction using dst, so it inherits that writemask. This block executes when dst.writemask != WRITEMASK_XYZW. The point is to override it back to XYZW, since it isn't. > > + emit(MOV(dst, src_reg(math->dst))); > > + } else if (brw->gen < 6) { > > + math->base_mrf = 1; > > + math->mlen = src1.file == BAD_FILE ? 1 : 2; > > } > > } > > Series is > > Reviewed-by: Matt Turner <matts...@gmail.com> Thanks!
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev