Mesa (main): llvmpipe: disable statistic queries during draw if queries are disabled

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: a36c3f6f6a41d84961b5633a627cd90feaa4d18d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a36c3f6f6a41d84961b5633a627cd90feaa4d18d

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>

---

 src/gallium/drivers/llvmpipe/lp_draw_arrays.c  | 3 ++-
 src/gallium/drivers/zink/ci/zink-lvp-fails.txt | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

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 9d56edd8c6d..0f83c789215 100644
--- a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt
@@ -303,7 +303,6 @@ spec at ext_texture_snorm@fbo-blending-formats at GL_LUMINANCE16_SNORM,Fail
 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_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