Mesa (main): intel/nir: don't report progress on rayqueries if no queries
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Apr 7 09:01:35 UTC 2022
Module: Mesa
Branch: main
Commit: b5031bd6f7ca99dbb3519a070af5e5ca454f78e9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b5031bd6f7ca99dbb3519a070af5e5ca454f78e9
Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date: Wed Apr 6 17:20:04 2022 +0300
intel/nir: don't report progress on rayqueries if no queries
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Fixes: c78be5da300a ("intel/fs: lower ray query intrinsics")
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Marcin Ślusarz <marcin.slusarz at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15769>
---
src/intel/compiler/brw_nir_lower_ray_queries.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/intel/compiler/brw_nir_lower_ray_queries.c b/src/intel/compiler/brw_nir_lower_ray_queries.c
index 60c248fe72a..68304feb544 100644
--- a/src/intel/compiler/brw_nir_lower_ray_queries.c
+++ b/src/intel/compiler/brw_nir_lower_ray_queries.c
@@ -572,6 +572,7 @@ brw_nir_lower_ray_queries(nir_shader *shader,
}
}
+ bool progress = false;
if (_mesa_hash_table_num_entries(state.queries) > 0) {
nir_foreach_function(function, shader) {
if (function->impl)
@@ -582,9 +583,11 @@ brw_nir_lower_ray_queries(nir_shader *shader,
nir_remove_dead_variables(shader,
nir_var_shader_temp | nir_var_function_temp,
NULL);
+
+ progress = true;
}
ralloc_free(state.queries);
- return true;
+ return progress;
}
More information about the mesa-commit
mailing list