summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2022-05-02 11:14:06 -0400
committerDylan Baker <dylan.c.baker@intel.com>2022-05-03 09:41:32 -0700
commitd9219c0ee6f56d59c6e9204f742d44f9f8daef76 (patch)
treea010557b0a9f16e30495ba357c7bddd87d0f0033
parent965bdf7db299fd8ba4afd5e4809b3fdf170e1b96 (diff)
llvmpipe: disable statistic queries during draw if queries are disabled
cc: mesa-stable fixes (zink): spec@ext_transform_feedback@generatemipmap prims_generated Reviewed-by: Emma Anholt <emma@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16278> (cherry picked from commit a36c3f6f6a41d84961b5633a627cd90feaa4d18d)
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/drivers/llvmpipe/lp_draw_arrays.c3
-rw-r--r--src/gallium/drivers/zink/ci/zink-lvp-fails.txt1
3 files changed, 3 insertions, 3 deletions
diff --git a/.pick_status.json b/.pick_status.json
index aab3dbe8275..6e14b7ff250 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -193,7 +193,7 @@
"description": "llvmpipe: disable statistic queries during draw 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_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 2eb71b557d8..60455993612 100644
--- a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt
@@ -299,7 +299,6 @@ spec@ext_texture_snorm@fbo-blending-formats@GL_LUMINANCE16_SNORM,Fail
spec@ext_texture_snorm@fbo-blending-formats@GL_LUMINANCE8_SNORM,Fail
spec@ext_texture_snorm@fbo-blending-formats@GL_LUMINANCE_SNORM,Fail
spec@ext_texture_swizzle@depth_texture_mode_and_swizzle,Fail
-spec@ext_transform_feedback@generatemipmap prims_generated,Fail
spec@intel_performance_query@intel_performance_query-issue_2235,Fail
spec@khr_texture_compression_astc@array-gl,Fail
spec@khr_texture_compression_astc@array-gl@12x12 Block Dim,Fail