This patch is
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
On 03/20/2015 11:24 AM, Jason Ekstrand wrote:
> ---
> src/mesa/drivers/dri/i965/brw_fs.h | 4 ++--
> src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 6 +++---
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_fs.h
> b/src/mesa/drivers/dri/i965/brw_fs.h
> index 608262f..278a8ee 100644
> --- a/src/mesa/drivers/dri/i965/brw_fs.h
> +++ b/src/mesa/drivers/dri/i965/brw_fs.h
> @@ -303,8 +303,8 @@ public:
> fs_reg fix_math_operand(fs_reg src);
> fs_inst *emit_math(enum opcode op, fs_reg dst, fs_reg src0);
> fs_inst *emit_math(enum opcode op, fs_reg dst, fs_reg src0, fs_reg src1);
> - void emit_lrp(const fs_reg &dst, const fs_reg &x, const fs_reg &y,
> - const fs_reg &a);
> + fs_inst *emit_lrp(const fs_reg &dst, const fs_reg &x, const fs_reg &y,
> + const fs_reg &a);
> void emit_minmax(enum brw_conditional_mod conditionalmod, const fs_reg
> &dst,
> const fs_reg &src0, const fs_reg &src1);
> void emit_discard_jump();
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
> b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
> index 2920a82..e6fb0cb 100644
> --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
> @@ -288,7 +288,7 @@ fs_visitor::visit(ir_dereference_array *ir)
> this->result = src;
> }
>
> -void
> +fs_inst *
> fs_visitor::emit_lrp(const fs_reg &dst, const fs_reg &x, const fs_reg &y,
> const fs_reg &a)
> {
> @@ -305,12 +305,12 @@ fs_visitor::emit_lrp(const fs_reg &dst, const fs_reg
> &x, const fs_reg &y,
> emit(ADD(one_minus_a, negative_a, fs_reg(1.0f)));
> emit(MUL(x_times_one_minus_a, x, one_minus_a));
>
> - emit(ADD(dst, x_times_one_minus_a, y_times_a));
> + return emit(ADD(dst, x_times_one_minus_a, y_times_a));
> } else {
> /* The LRP instruction actually does op1 * op0 + op2 * (1 - op0), so
> * we need to reorder the operands.
> */
> - emit(LRP(dst, a, y, x));
> + return emit(LRP(dst, a, y, x));
> }
> }
>
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
