Mesa (master): softpipe: count CS invocations for pipeline stats queries.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Dec 23 20:02:02 UTC 2020
Module: Mesa
Branch: master
Commit: 5dd5fb1926c72c97571ddcb5f6c696766e7c9abc
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5dd5fb1926c72c97571ddcb5f6c696766e7c9abc
Author: Eric Anholt <eric at anholt.net>
Date: Fri Dec 11 12:39:22 2020 -0800
softpipe: count CS invocations for pipeline stats queries.
Part of fixing KHR-GL33.pipeline_statistics_query_tests_ARB.
functional_compute_shader_invocations
(also requires a test bugfix:
https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/2694).
Fixes: e749c30cebe0 ("softpipe: add support for compute shaders. (v2)")
Reviewed-by: Gert Wollny <gert.wollny at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8065>
---
src/gallium/drivers/softpipe/sp_compute.c | 5 +++++
src/gallium/drivers/softpipe/sp_query.c | 2 ++
2 files changed, 7 insertions(+)
diff --git a/src/gallium/drivers/softpipe/sp_compute.c b/src/gallium/drivers/softpipe/sp_compute.c
index 7e9a9455e90..ac8d51196a4 100644
--- a/src/gallium/drivers/softpipe/sp_compute.c
+++ b/src/gallium/drivers/softpipe/sp_compute.c
@@ -227,6 +227,11 @@ softpipe_launch_grid(struct pipe_context *context,
}
}
+ if (softpipe->active_statistics_queries) {
+ softpipe->pipeline_statistics.cs_invocations +=
+ grid_size[0] * grid_size[1] * grid_size[2];
+ }
+
for (i = 0; i < num_threads_in_group; i++) {
cs_delete(cs, machines[i]);
tgsi_exec_machine_destroy(machines[i]);
diff --git a/src/gallium/drivers/softpipe/sp_query.c b/src/gallium/drivers/softpipe/sp_query.c
index bb86194b31f..91fa0c6a990 100644
--- a/src/gallium/drivers/softpipe/sp_query.c
+++ b/src/gallium/drivers/softpipe/sp_query.c
@@ -201,6 +201,8 @@ softpipe_end_query(struct pipe_context *pipe, struct pipe_query *q)
softpipe->pipeline_statistics.c_primitives - sq->stats.c_primitives;
sq->stats.ps_invocations =
softpipe->pipeline_statistics.ps_invocations - sq->stats.ps_invocations;
+ sq->stats.cs_invocations =
+ softpipe->pipeline_statistics.cs_invocations - sq->stats.cs_invocations;
softpipe->active_statistics_queries--;
break;
More information about the mesa-commit
mailing list