summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Ekstrand <jason@jlekstrand.net>2020-10-29 10:15:46 -0500
committerDylan Baker <dylan.c.baker@intel.com>2020-11-19 10:47:37 -0800
commita37b964ec1359515ecb7fa36dfcd0431dc0fe410 (patch)
tree8e1da0fbd35a1166f91c706cbf3cb713b969d7f6
parent307fe5bd61ac123decd798df902dcf86c19093df (diff)
nir/opt_intrinsics: Report progress for the gl_SampleMask optimization
Fixes: d3ce8a7f6b93 "nir: optimize gl_SampleMaskIn to gl_HelperInvocation..." Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7366> (cherry picked from commit d9c0f3627d78c33926c358f362818f9fe917c8a6)
-rw-r--r--.pick_status.json2
-rw-r--r--src/compiler/nir/nir_opt_intrinsics.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 7631b18f607..b1de36c3fab 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4459,7 +4459,7 @@
"description": "nir/opt_intrinsics: Report progress for the gl_SampleMask optimization",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "d3ce8a7f6b93e893929b81f4d6605a2a968730a1"
},
diff --git a/src/compiler/nir/nir_opt_intrinsics.c b/src/compiler/nir/nir_opt_intrinsics.c
index 503462ecfbe..69b53459824 100644
--- a/src/compiler/nir/nir_opt_intrinsics.c
+++ b/src/compiler/nir/nir_opt_intrinsics.c
@@ -86,6 +86,7 @@ opt_intrinsics_impl(nir_function_impl *impl,
nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa,
nir_src_for_ssa(new_expr));
nir_instr_remove(&alu->instr);
+ progress = true;
continue;
}
}