[Mesa-dev] [PATCH 3/3] glsl: ir_explog_to_explog2 is no more

[Kenneth Graunke]

On Friday, March 31, 2017 3:58:58 AM PDT Erik Faye-Lund wrote:
> Since 63684a9a ("glsl: Combine many instruction lowering passes
> into one.", Thu Nov 18 2010), we no longer have anything called
> ir_explog_to_explog2. So it's only confusing to have those
> references there.
> 
> Update with the appropriate method, so people can grep for it the
> current tree if they encounter it.
> 
> Signed-off-by: Erik Faye-Lund <kusmabite at gmail.com>
> ---
>  src/mesa/program/ir_to_mesa.cpp            | 4 +++-
>  src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 4 +++-
>  2 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
> index a2476dd..9760f7b 100644
> --- a/src/mesa/program/ir_to_mesa.cpp
> +++ b/src/mesa/program/ir_to_mesa.cpp
> @@ -1069,8 +1069,10 @@ ir_to_mesa_visitor::visit(ir_expression *ir)
>        emit_scalar(ir, OPCODE_EX2, result_dst, op[0]);
>        break;
>     case ir_unop_exp:
> +      assert(!"not reached: should be handled by exp_to_exp2");
> +      break;
>     case ir_unop_log:
> -      assert(!"not reached: should be handled by ir_explog_to_explog2");
> +      assert(!"not reached: should be handled by log_to_log2");
>        break;
>     case ir_unop_log2:
>        emit_scalar(ir, OPCODE_LG2, result_dst, op[0]);
> diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> index 369dff7..8438e98 100644
> --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> @@ -1661,8 +1661,10 @@ glsl_to_tgsi_visitor::visit_expression(ir_expression* ir, st_src_reg *op)
>        emit_scalar(ir, TGSI_OPCODE_EX2, result_dst, op[0]);
>        break;
>     case ir_unop_exp:
> +      assert(!"not reached: should be handled by exp_to_exp2");
> +      break;
>     case ir_unop_log:
> -      assert(!"not reached: should be handled by ir_explog_to_explog2");
> +      assert(!"not reached: should be handled by log_to_log2");
>        break;
>     case ir_unop_log2:
>        emit_scalar(ir, TGSI_OPCODE_LG2, result_dst, op[0]);
> 

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part.
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20170331/c9f894ac/attachment.sig>