fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

llvmpipe: disable statistic queries during draw if queries are disabled

Browse source 
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 a36c3f6f6a)
This commit is contained in:
Mike Blumenkrantz 2022-05-02 11:14:06 -04:00 • committed by Dylan Baker
parent 965bdf7db2
commit d9219c0ee6
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -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
},

3
src/gallium/drivers/llvmpipe/lp_draw_arrays.c
View file

@ -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 &&

1
src/gallium/drivers/zink/ci/zink-lvp-fails.txt
View file

@ -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