gfxstream: fix some integration bugs

- Fix end2end test target (AOSP-only)
- Fix decoder to use host vk_util.h, not guest
- typo fixes

Reviewed-by: Marcin Radomski <dextero@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33077>
This commit is contained in:
Gurchetan Singh 2025-01-16 17:47:28 -08:00 committed by Marge Bot
parent 78f5dfca86
commit 61d66a6ea7
3 changed files with 3 additions and 2 deletions

View file

@ -138,7 +138,7 @@ SNAPSHOT_HANDLE_DEPENDENCIES = [
handleDependenciesDict = dict(SNAPSHOT_HANDLE_DEPENDENCIES)
def extract_deps_vkAllocateMemory(param, access, lenExpr, api, cgen):
cgen.stmt("const VkMemoryDedicatedAllocateInfo* dedicatedAllocateInfo = vk_find_struct_const(pAllocateInfo, MEMORY_DEDICATED_ALLOCATE_INFO)");
cgen.stmt("const VkMemoryDedicatedAllocateInfo* dedicatedAllocateInfo = vk_find_struct<VkMemoryDedicatedAllocateInfo>(pAllocateInfo)");
cgen.beginIf("dedicatedAllocateInfo");
cgen.beginIf("dedicatedAllocateInfo->image")
cgen.stmt("mReconstruction.addHandleDependency((const uint64_t*)%s, %s, (uint64_t)(uintptr_t)%s)" % \

View file

@ -391,6 +391,7 @@ void gfxstream_vk_DestroyInstance(VkInstance _instance, const VkAllocationCallba
// To make End2EndTests happy, since now the host connection is statically linked to
// libvulkan_ranchu.so [separate HostConnections now].
#if defined(END2END_TESTS)
GfxStreamConnectionManager* mgr = getConnectionManager();
mgr->threadLocalExit();
VirtGpuDevice::resetInstance();
gSeqno = 0;

View file

@ -7246,7 +7246,7 @@ VkResult ResourceTracker::on_vkAllocateCommandBuffers(
#if defined(VK_USE_PLATFORM_ANDROID_KHR)
VkResult ResourceTracker::exportSyncFdForQSRILocked(VkImage image, int* fd) {
mesa_logd("%s: call for image %p hos timage handle 0x%llx\n", __func__, (void*)image,
mesa_logd("%s: call for image %p host image handle 0x%llx\n", __func__, (void*)image,
(unsigned long long)get_host_u64_VkImage(image));
if (mFeatureInfo.hasVirtioGpuNativeSync) {