summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2010-08-05 15:22:05 -0700
committerEric Anholt <[email protected]>2010-08-05 15:34:00 -0700
commitbc4034b243975089c06c4415d4e26edaaaec7a46 (patch)
treec6a3ae69c5b02f86bcd1bbc224f65eace4c49821 /src/mesa
parent8048226b7b1bbe8fd89f9c32fa4fadca4b8760c4 (diff)
glsl2: Add a pass to convert exp and log to exp2 and log2.
Fixes ir_to_mesa handling of unop_log, which used the weird ARB_vp LOG opcode that doesn't do what we want. This also lets the multiplication coefficients in there get constant-folded, possibly. Fixes: glsl-fs-log
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/program/ir_to_mesa.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index 299b11d2741..26fbc4349ab 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -752,15 +752,12 @@ ir_to_mesa_visitor::visit(ir_expression *ir)
ir_to_mesa_emit_scalar_op1(ir, OPCODE_RCP, result_dst, op[0]);
break;
- case ir_unop_exp:
- ir_to_mesa_emit_scalar_op2(ir, OPCODE_POW, result_dst,
- src_reg_for_float(M_E), op[0]);
- break;
case ir_unop_exp2:
ir_to_mesa_emit_scalar_op1(ir, OPCODE_EX2, result_dst, op[0]);
break;
+ case ir_unop_exp:
case ir_unop_log:
- ir_to_mesa_emit_scalar_op1(ir, OPCODE_LOG, result_dst, op[0]);
+ assert(!"not reached: should be handled by ir_explog_to_explog2");
break;
case ir_unop_log2:
ir_to_mesa_emit_scalar_op1(ir, OPCODE_LG2, result_dst, op[0]);