diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2022-01-07 09:41:44 -0500 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2022-01-26 18:28:29 +0000 |
| commit | d9b0864420c846705d8a7fb89914df97e8b1004b (patch) | |
| tree | 7709fb142f04371f32e874dd7059d2e8d5b88c21 | |
| parent | 834af3f195db821b460ed887f6039c22cc2f0c47 (diff) | |
zink: always set number of timestamp results to 1 for internal qbo
timestamp queries don't accumulate results
Fixes: 93190be1b99 ("zink: rewrite query internals")
Reviewed-by: Hoe Hao Cheng <haochengho12907@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14397>
(cherry picked from commit bf9ac4dfcd54f4cc164851af32845b978282e8e2)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_query.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index f9e2a589a1a..e813887eb89 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -5224,7 +5224,7 @@ "description": "zink: always set number of timestamp results to 1 for internal qbo", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "93190be1b990d61df329ca0cbce9bd0fb31c7607" }, diff --git a/src/gallium/drivers/zink/zink_query.c b/src/gallium/drivers/zink/zink_query.c index 636fbc2689d..72a8b5254e9 100644 --- a/src/gallium/drivers/zink/zink_query.c +++ b/src/gallium/drivers/zink/zink_query.c @@ -650,6 +650,8 @@ update_qbo(struct zink_context *ctx, struct zink_query *q) if (!is_timestamp) q->curr_qbo->num_results++; + else + q->curr_qbo->num_results = 1; q->needs_update = false; } |