From bfacad0e96e331159aa5f6c869da74bdd569b940 Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Tue, 2 Jan 2024 13:49:42 -0800 Subject: [PATCH] gfxstream: nuke goldfish_vk_handlemap Not used. Reviewed-by: Aaron Ruby Acked-by: Yonggang Luo Acked-by: Adam Jackson Part-of: --- src/gfxstream/codegen/scripts/cerealgenerator.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/gfxstream/codegen/scripts/cerealgenerator.py b/src/gfxstream/codegen/scripts/cerealgenerator.py index 886df5397c4..7cbf6174a2d 100644 --- a/src/gfxstream/codegen/scripts/cerealgenerator.py +++ b/src/gfxstream/codegen/scripts/cerealgenerator.py @@ -135,9 +135,8 @@ SUPPORTED_FEATURES = [ HOST_MODULES = ["goldfish_vk_extension_structs", "goldfish_vk_marshaling", "goldfish_vk_reserved_marshaling", "goldfish_vk_deepcopy", - "goldfish_vk_handlemap", "goldfish_vk_dispatch", - "goldfish_vk_transform", "VkDecoder", "VkDecoderSnapshot", - "VkSubDecoder"] + "goldfish_vk_dispatch", "goldfish_vk_transform", "VkDecoder", + "VkDecoderSnapshot", "VkSubDecoder"] # By default, the all wrappers are run all on all features. In certain cases, # we wish run wrappers when the module requires it. For example, `VK_GOOGLE_gfxstream` @@ -408,11 +407,6 @@ class IOStream; #include "{self.baseLibDirPrefix}/BumpPool.h" using android::base::Allocator; using android::base::BumpPool; -""" - handleMapInclude = f""" -{self.hostCommonExtraVulkanHeaders} -#include "goldfish_vk_private_defs.h" -#include "VulkanHandleMapping.h" """ transformIncludeGuest = """ #include "goldfish_vk_private_defs.h" @@ -623,9 +617,6 @@ class BumpPool; self.addCppModule("common", "goldfish_vk_deepcopy", extraHeader=poolInclude, extraImpl=commonCerealImplIncludes + deepcopyInclude) - self.addCppModule("common", "goldfish_vk_handlemap", - extraHeader=handleMapInclude, - extraImpl=commonCerealImplIncludes) self.addCppModule("common", "goldfish_vk_dispatch", extraHeader=dispatchHeaderDefs, extraImpl=dispatchImplIncludes) @@ -671,7 +662,6 @@ class BumpPool; self.addWrapper(cereal.VulkanMarshaling, "goldfish_vk_marshaling") self.addWrapper(cereal.VulkanReservedMarshaling, "goldfish_vk_reserved_marshaling", variant = "host") self.addWrapper(cereal.VulkanDeepcopy, "goldfish_vk_deepcopy") - self.addWrapper(cereal.VulkanHandleMap, "goldfish_vk_handlemap") self.addWrapper(cereal.VulkanDispatch, "goldfish_vk_dispatch") self.addWrapper(cereal.VulkanTransform, "goldfish_vk_transform", resourceTrackerTypeName="VkDecoderGlobalState") self.addWrapper(cereal.VulkanDecoder, "VkDecoder")