diff options
| author | Jason Ekstrand <[email protected]> | 2019-02-11 22:39:45 -0600 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2019-02-14 23:02:44 -0600 |
| commit | 367b0ede4d9115aba772d6e46ec73642761f7ff6 (patch) | |
| tree | 56542cc9ebd310beba43d4febb217253df1fe579 | |
| parent | 8c859367df95b74e7596f7fefffbdbf08bb8f8c7 (diff) | |
intel/fs: Bail in optimize_extract_to_float if we have modifiers
This fixes a bug in runscape where we were optimizing x >> 16 to an
extract and then negating and converting to float. The NIR to fs pass
was dropping the negate on the floor breaking a geometry shader and
causing it to render nothing.
Fixes: 1f862e923cb "i965/fs: Optimize float conversions of byte/word..."
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109601
Tested-by: Lionel Landwerlin <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
| -rw-r--r-- | src/intel/compiler/brw_fs_nir.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp index a24e880e58d..02f1e55eae3 100644 --- a/src/intel/compiler/brw_fs_nir.cpp +++ b/src/intel/compiler/brw_fs_nir.cpp @@ -512,6 +512,15 @@ fs_visitor::optimize_extract_to_float(nir_alu_instr *instr, src0->op != nir_op_extract_i8 && src0->op != nir_op_extract_i16) return false; + /* If either opcode has source modifiers, bail. + * + * TODO: We can potentially handle source modifiers if both of the opcodes + * we're combining are signed integers. + */ + if (instr->src[0].abs || instr->src[0].negate || + src0->src[0].abs || src0->src[0].negate) + return false; + unsigned element = nir_src_as_uint(src0->src[1].src); /* Element type to extract.*/ |