Mesa (master): i965/fs: Put immediate operand as src2

Matt Turner mattst88 at kemper.freedesktop.org
Fri Mar 1 00:29:49 UTC 2013


Module: Mesa
Branch: master
Commit: 4154ac066f2cdeddfe934884b59c8f1ff393545d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4154ac066f2cdeddfe934884b59c8f1ff393545d

Author: Matt Turner <mattst88 at gmail.com>
Date:   Thu Feb 28 16:26:57 2013 -0800

i965/fs: Put immediate operand as src2

Immediate operands can only be src2 in 2-source instructions. Fixes
piglit failures since 0a1d145e (oops!).

Spotted-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
index e6daf2f..de08b0b 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
@@ -210,7 +210,7 @@ fs_visitor::emit_lrp(fs_reg dst, fs_reg x, fs_reg y, fs_reg a)
       emit(MUL(y_times_a, y, a));
 
       a.negate = !a.negate;
-      emit(ADD(one_minus_a, fs_reg(1.0f), a));
+      emit(ADD(one_minus_a, 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));




More information about the mesa-commit mailing list