Mesa (staging/20.1): llvmpipe/cs: update compute counters not fragment shader.

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: 6ae6ecd651eeeff7cb0f2bec7e8ed2885961bf72
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6ae6ecd651eeeff7cb0f2bec7e8ed2885961bf72

Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Jun 19 15:27:51 2020 +1000

llvmpipe/cs: update compute counters not fragment shader.

This was updating the wrong counters.

Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Fixes: a6f6ca37c82bb6810971 ("llvmpipe: add initial shader create/bind/destroy variants framework.")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6339>
(cherry picked from commit e137bbb87fa8ce9a4ab1f24bba26f12c1f65cbc9)

---

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

diff --git a/.pick_status.json b/.pick_status.json
index 3b43c5e92e5..76496b1c1ed 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -247,7 +247,7 @@
         "description": "llvmpipe/cs: update compute counters not fragment shader.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "a6f6ca37c82bb6810971cab0dccc308e4d28a05a"
     },
diff --git a/src/gallium/drivers/llvmpipe/lp_state_cs.c b/src/gallium/drivers/llvmpipe/lp_state_cs.c
index ff767a2a860..319db7b29d7 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_cs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_cs.c
@@ -496,8 +496,8 @@ llvmpipe_remove_cs_shader_variant(struct llvmpipe_context *lp,
 
    /* remove from context's list */
    remove_from_list(&variant->list_item_global);
-   lp->nr_fs_variants--;
-   lp->nr_fs_instrs -= variant->nr_instrs;
+   lp->nr_cs_variants--;
+   lp->nr_cs_instrs -= variant->nr_instrs;
 
    FREE(variant);
 }