Mesa (staging/22.1): llvmpipe: disable compute statistics queries if queries are disabled

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: 9b60b2ecdc02723159c84e2f44267dd29984262c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9b60b2ecdc02723159c84e2f44267dd29984262c

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Mon May  2 11:15:40 2022 -0400

llvmpipe: disable compute statistics queries if queries are disabled

cc: mesa-stable

Reviewed-by: Emma Anholt <emma at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16278>
(cherry picked from commit 4a4adb65cec466ca7861856922f84b95bfd0fac1)

---

 .pick_status.json                          | 2 +-
 src/gallium/drivers/llvmpipe/lp_state_cs.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 6e14b7ff250..2576537c3c8 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -175,7 +175,7 @@
         "description": "llvmpipe: disable compute statistics queries if queries are disabled",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/llvmpipe/lp_state_cs.c b/src/gallium/drivers/llvmpipe/lp_state_cs.c
index 21fecc39b34..6f761d9d303 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_cs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_cs.c
@@ -1424,7 +1424,8 @@ static void llvmpipe_launch_grid(struct pipe_context *pipe,
 
       lp_cs_tpool_wait_for_task(screen->cs_tpool, &task);
    }
-   llvmpipe->pipeline_statistics.cs_invocations += num_tasks * info->block[0] * info->block[1] * info->block[2];
+   if (!llvmpipe->queries_disabled)
+      llvmpipe->pipeline_statistics.cs_invocations += num_tasks * info->block[0] * info->block[1] * info->block[2];
 }
 
 static void