summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2019-03-01 14:39:14 -0800
committerIan Romanick <[email protected]>2019-03-02 13:58:50 -0800
commitd1d56f5f9afceab732e46c43010738c4936fb9b9 (patch)
treef6f493b10bd272b2778b13f822bdc78892789071
parent32ffd90002b04bff20a587e5d2f31fe79af1a4f2 (diff)
intel/fs: Don't assert on b2f with a saturate modifier
This ran afoul of Iris's use of nir_lower_clamp_color_outputs which applies fsat() before writes to vertex shader color outpus. Reviewed-by: Kenneth Graunke <[email protected]> Fixes: 7725d609387 ("intel/fs: Emit better code for b2f(inot(a)) and b2i(inot(a))")
-rw-r--r--src/intel/compiler/brw_fs_nir.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp
index fb373e1757e..a4fd29ff9ec 100644
--- a/src/intel/compiler/brw_fs_nir.cpp
+++ b/src/intel/compiler/brw_fs_nir.cpp
@@ -800,8 +800,10 @@ fs_visitor::try_emit_b2fi_of_inot(const fs_builder &bld,
prepare_alu_destination_and_sources(bld, inot_instr, &op, false);
+ /* Ignore the saturate modifier, if there is one. The result of the
+ * arithmetic can only be 0 or 1, so the clamping will do nothing anyway.
+ */
bld.ADD(result, op, brw_imm_d(1));
- assert(!instr->dest.saturate);
return true;
}