From 53706931bc4c52bade25eaaa6b899559c3bb05ec Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Thu, 12 Mar 2026 16:33:26 -0700 Subject: [PATCH] gfxstream: fixes to get Fuchsia headless to compile The prior version of gfxstream-fuchsia featured an Android compat layer, and only worked with Goldfish. The compat layer was deleted a while ago. The Fuchsia Goldfish integration was deleted here: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33050 since the Fuchsia emulator itself uses a frozen version of the library. This goes further in that direction: deleting leftovers of the Fuchsia Android compat layer, which used provided VK dispatch. This allows Fuchsia + gfxstream to build via meson2hermetic, with the a few additional common core patches applied. Reviewed-by: David Gilhooley Reviewed-by: Aaron Ruby Part-of: --- src/gfxstream/guest/meson.build | 2 +- src/gfxstream/guest/vulkan_enc/Resources.cpp | 2 +- src/gfxstream/guest/vulkan_enc/Resources.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gfxstream/guest/meson.build b/src/gfxstream/guest/meson.build index 2b22eb18952..7bfbf8309f4 100644 --- a/src/gfxstream/guest/meson.build +++ b/src/gfxstream/guest/meson.build @@ -18,7 +18,7 @@ gfxstream_guest_args = cpp_msvc_compat_args + ['-D_FILE_OFFSET_BITS=64'] # Our internal guest build if host_machine.system() == 'windows' gfxstream_guest_args += '-DWINDOWS_GUEST_BUILD' -else +elif host_machine.system() != 'fuchsia' gfxstream_guest_args += '-DLINUX_GUEST_BUILD' endif diff --git a/src/gfxstream/guest/vulkan_enc/Resources.cpp b/src/gfxstream/guest/vulkan_enc/Resources.cpp index b7143bef9f6..190497ed0fe 100644 --- a/src/gfxstream/guest/vulkan_enc/Resources.cpp +++ b/src/gfxstream/guest/vulkan_enc/Resources.cpp @@ -21,7 +21,7 @@ extern "C" { -#if DETECT_OS_ANDROID || DETECT_OS_FUCHSIA +#if DETECT_OS_ANDROID #define SET_HWVULKAN_DISPATCH_MAGIC res->dispatch.magic = HWVULKAN_DISPATCH_MAGIC; #elif DETECT_OS_LINUX #define SET_HWVULKAN_DISPATCH_MAGIC res->loaderData.loaderMagic = ICD_LOADER_MAGIC; diff --git a/src/gfxstream/guest/vulkan_enc/Resources.h b/src/gfxstream/guest/vulkan_enc/Resources.h index a2ab2b8f09f..4c1ec67e95c 100644 --- a/src/gfxstream/guest/vulkan_enc/Resources.h +++ b/src/gfxstream/guest/vulkan_enc/Resources.h @@ -5,7 +5,7 @@ #pragma once #include "util/detect_os.h" -#if DETECT_OS_ANDROID || DETECT_OS_FUCHSIA +#if DETECT_OS_ANDROID #include #elif DETECT_OS_LINUX #include @@ -39,7 +39,7 @@ struct goldfish_vk_object_list { struct goldfish_vk_object_list* next; }; -#if DETECT_OS_ANDROID || DETECT_OS_FUCHSIA +#if DETECT_OS_ANDROID #define DECLARE_HWVULKAN_DISPATCH hwvulkan_dispatch_t dispatch; #elif DETECT_OS_LINUX #define DECLARE_HWVULKAN_DISPATCH VK_LOADER_DATA loaderData;