From 26b33e2e4dc0d6cbfc1dd2f2bbda7af377517d33 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Fri, 7 Mar 2025 13:44:32 -0800 Subject: [PATCH] lavapipe: set availability bit for accel struct host queries Fixes: 897ccbd180a ("lavapipe: Implement VK_KHR_acceleration_structure") Signed-off-by: Yiwei Zhang Reviewed-by: Mike Blumenkrantz Part-of: (cherry picked from commit bc190cab2da0fbbf85e76b38abde432ae87195a1) --- .pick_status.json | 2 +- src/gallium/frontends/lavapipe/lvp_query.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 0209739e61a..6e39d816fb4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3184,7 +3184,7 @@ "description": "lavapipe: set availability bit for accel struct host queries", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "897ccbd180ae2e0e6a60173e0511bc25a4f5a118", "notes": null diff --git a/src/gallium/frontends/lavapipe/lvp_query.c b/src/gallium/frontends/lavapipe/lvp_query.c index ef85dfe72eb..82f52a6d28a 100644 --- a/src/gallium/frontends/lavapipe/lvp_query.c +++ b/src/gallium/frontends/lavapipe/lvp_query.c @@ -139,10 +139,14 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_GetQueryPoolResults( uint64_t *dst = (uint64_t *)dest; uint64_t *src = (uint64_t *)pool->data; *dst = src[i]; + if (flags & VK_QUERY_RESULT_WITH_AVAILABILITY_BIT) + *(dst + 1) = 1; } else { uint32_t *dst = (uint32_t *)dest; uint64_t *src = (uint64_t *)pool->data; *dst = src[i]; + if (flags & VK_QUERY_RESULT_WITH_AVAILABILITY_BIT) + *(dst + 1) = 1; } continue; }