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

lavapipe: fix xfb availability query copying

Browse source 
xfb queries have 2 results

cc: mesa-stable

fixes (zink):
spec@arb_query_buffer_object@qbo

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15644>
This commit is contained in:
Mike Blumenkrantz 2022-03-29 12:02:25 -04:00 • committed by Marge Bot
parent 63d0440034
commit 4eca6e3e5d
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/drivers/zink/ci/zink-lvp-flakes.txt
View file

@ -9,8 +9,3 @@ glx@glx-copy-sub-buffer samples=2
# "free(): invalid next size (fast)"
# since it's heap corruption, it may or may not appear in a particular run
spec@arb_compute_variable_group_size@local-size
# ???
spec@arb_query_buffer_object@qbo
spec@arb_query_buffer_object@qbo@query-GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN-ASYNC-GL_UNSIGNED_INT
spec@arb_query_buffer_object@qbo@query-GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN-ASYNC-GL_UNSIGNED_INT64_ARB

2
src/gallium/frontends/lavapipe/lvp_execute.c
View file

@ -2816,7 +2816,7 @@ static void handle_copy_query_pool_results(struct vk_cmd_queue_entry *cmd,
if (pool->type == VK_QUERY_TYPE_PIPELINE_STATISTICS) {
num_results = util_bitcount(pool->pipeline_stats);
} else
num_results = 1;
num_results = pool-> type == VK_QUERY_TYPE_TRANSFORM_FEEDBACK_STREAM_EXT ? 2 : 1;
state->pctx->get_query_result_resource(state->pctx,
pool->queries[i],
flags,