diff options
| author | Eric Anholt <eric@anholt.net> | 2012-08-06 14:59:39 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-08-08 16:21:30 -0700 |
| commit | 9b4053cabd8bda180b352d2d2047209f6ca5f6e8 (patch) | |
| tree | 98e1bc1e07fa9ba203fb52e8cafa5ba0ff3d80a2 /src/mesa/drivers/dri/i965/brw_vec4_emit.cpp | |
| parent | 33dfdc735e052d9c9b33883350e926d40220b6ac (diff) | |
i965: Drop the confusing saturate argument to math instruction setup.
This was ridiculous. We were ignoring the inst->header.saturate flag in the
case of math and only math. On gen4, we would leave inst->header.saturate in
place if it happened to be set, which would end up being applied to the
implicit mov and thus trash the first argument. On gen6, we would overwrite
inst->header.saturate with the saturate flag from the argument, which was not
set appropriately in brw_vec4_emit.cpp, and was only not a bug due to our
incompetence at coalescing saturate moves.
By ripping the argument out and making saturate work just like all the other
brw_eu_emit.c code generation, we can avoid both these classes of bugs.
Fixes piglit fog-modes, and the new specific fs-saturate-exp2 case.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48628
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_vec4_emit.cpp')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_emit.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp index 7658bb86454..21eafcbcb5d 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp @@ -262,7 +262,6 @@ vec4_visitor::generate_math1_gen4(vec4_instruction *inst, brw_math(p, dst, brw_math_function(inst->opcode), - BRW_MATH_SATURATE_NONE, inst->base_mrf, src, BRW_MATH_DATA_VECTOR, @@ -291,7 +290,6 @@ vec4_visitor::generate_math1_gen6(vec4_instruction *inst, brw_math(p, dst, brw_math_function(inst->opcode), - BRW_MATH_SATURATE_NONE, inst->base_mrf, src, BRW_MATH_DATA_SCALAR, @@ -355,7 +353,6 @@ vec4_visitor::generate_math2_gen4(vec4_instruction *inst, brw_math(p, dst, brw_math_function(inst->opcode), - BRW_MATH_SATURATE_NONE, inst->base_mrf, op0, BRW_MATH_DATA_VECTOR, |