Mesa (staging/22.0): llvmpipe: disable statistic queries during draw if queries are disabled
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue May 3 17:43:16 UTC 2022
Module: Mesa
Branch: staging/22.0
Commit: c9d574bad86e90acc8e8e2a658eb2a414f3305fe
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c9d574bad86e90acc8e8e2a658eb2a414f3305fe
Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date: Mon May 2 11:14:06 2022 -0400
llvmpipe: disable statistic queries during draw if queries are disabled
cc: mesa-stable
fixes (zink):
spec at ext_transform_feedback@generatemipmap prims_generated
Reviewed-by: Emma Anholt <emma at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16278>
(cherry picked from commit a36c3f6f6a41d84961b5633a627cd90feaa4d18d)
Conflicts:
src/gallium/drivers/zink/ci/zink-lvp-fails.txt
---
.pick_status.json | 2 +-
src/gallium/drivers/llvmpipe/lp_draw_arrays.c | 3 ++-
src/gallium/drivers/zink/ci/zink-lvp-fails.txt | 1 -
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.pick_status.json b/.pick_status.json
index 99bb27e36d3..876b692ee64 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -172,7 +172,7 @@
"description": "llvmpipe: disable statistic queries during draw if queries are disabled",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"because_sha": null
},
{
diff --git a/src/gallium/drivers/llvmpipe/lp_draw_arrays.c b/src/gallium/drivers/llvmpipe/lp_draw_arrays.c
index 48d112ac08c..ec4d47bc08d 100644
--- a/src/gallium/drivers/llvmpipe/lp_draw_arrays.c
+++ b/src/gallium/drivers/llvmpipe/lp_draw_arrays.c
@@ -139,7 +139,8 @@ llvmpipe_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info,
}
}
draw_collect_pipeline_statistics(draw,
- lp->active_statistics_queries > 0);
+ lp->active_statistics_queries > 0 &&
+ !lp->queries_disabled);
draw_collect_primitives_generated(draw,
lp->active_primgen_queries &&
diff --git a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt
index 4bff4ec917e..854ec1b60fb 100644
--- a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt
@@ -549,7 +549,6 @@ spec at ext_texture_snorm@fbo-blending-formats at GL_LUMINANCE8_SNORM,Fail
spec at ext_texture_snorm@fbo-blending-formats at GL_LUMINANCE_SNORM,Fail
spec at ext_texture_swizzle@depth_texture_mode_and_swizzle,Fail
spec at ext_transform_feedback2@counting with pause,Fail
-spec at ext_transform_feedback@generatemipmap prims_generated,Fail
spec at intel_performance_query@intel_performance_query-issue_2235,Fail
spec at khr_texture_compression_astc@array-gl,Fail
spec at khr_texture_compression_astc@array-gl at 12x12 Block Dim,Fail
More information about the mesa-commit
mailing list