fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-23 16:10:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

gfxstream: Remove duplicated boxed handle func declarations

Browse source 
... and fix up include paths.

Test: cvd create --gpu_mode=gfxstream_guest_angle_host_swiftshader

Reviewed-by: Aaron Ruby <aruby@qnx.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33740>
This commit is contained in:
Jason Macnak 2025-02-24 14:16:41 -08:00 • committed by Marge Bot
parent 039e64264a
commit 14bc2e2d39
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gfxstream/codegen/scripts/cerealgenerator.py
View file

@ -381,6 +381,11 @@ class IOStream;
#undef VK_ANDROID_external_memory_android_hardware_buffer
""" % VULKAN_STREAM_TYPE_GUEST
reservedMarshalingHostIncludes = """
#include "VulkanBoxedHandles.h"
"""
reservedmarshalImplIncludeGuest = """
#include "Resources.h"
"""
@ -496,6 +501,7 @@ using DlSymFunc = void* (void*, const char*);
decoderSnapshotImplIncludes = f"""
#include <mutex>
#include "VulkanBoxedHandles.h"
#include "VulkanHandleMapping.h"
#include "VkDecoderGlobalState.h"
#include "VkReconstruction.h"
@ -535,6 +541,7 @@ class BumpPool;
#include "VkDecoderGlobalState.h"
#include "VkDecoderSnapshot.h"
#include "VulkanBoxedHandles.h"
#include "VulkanDispatch.h"
#include "%s.h"
@ -622,7 +629,7 @@ class BumpPool;
extraImpl=commonCerealImplIncludes)
self.addCppModule("common", "goldfish_vk_reserved_marshaling",
extraHeader=vulkanStreamIncludeHost,
extraImpl=commonCerealImplIncludes)
extraImpl=commonCerealImplIncludes + reservedMarshalingHostIncludes)
self.addCppModule("common", "goldfish_vk_deepcopy",
extraHeader=poolInclude,
extraImpl=commonCerealImplIncludes + deepcopyInclude)