From 4f9d7c3385aa306c55135766bfa4662ae1f8f734 Mon Sep 17 00:00:00 2001
From: Gurchetan Singh <gurchetansingh@google.com>
Date: Mon, 24 Nov 2025 10:37:02 -0800
Subject: [PATCH] gfxstream: codegen: don't generate custom protocols in
 function table

vulkan_gfxstream.h contains custom protocols not found
in vk.xml (vk_gfxstream.xml).

gfxstream_vk_entrypoints.h is codegen by Mesa common code,
and it does not accept the custom XML.

So avoid generating implementations for them:

guest/vulkan_enc/gfxstream_guest_vk_autogen_impl/gen/func_table.cpp:5321:1:
note: declare 'static' if the function is not intended to be
      used outside of this translation unit
 5321 | void gfxstream_vk_CollectDescriptorPoolIdsGOOGLE(
      | ^
      | static
fatal error: too many errors emitted, stopping now [-ferror-limit=]

Reviewed-by: David Gilhooley <djgilhooley.gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38632>
---
 .../codegen/scripts/cereal/functable.py       | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/gfxstream/codegen/scripts/cereal/functable.py b/src/gfxstream/codegen/scripts/cereal/functable.py
index 2979db8215c..c0c3146a777 100644
--- a/src/gfxstream/codegen/scripts/cereal/functable.py
+++ b/src/gfxstream/codegen/scripts/cereal/functable.py
@@ -132,6 +132,33 @@ NON_AUTOGEN_ENTRYPOINTS = [
     "vkGetDeviceQueue",
     "vkGetDeviceQueue2",
     "vkGetPhysicalDeviceProperties",
+    # Custom gfxstream functions
+    "vkMapMemoryIntoAddressSpaceGOOGLE",
+    "vkUpdateDescriptorSetWithTemplateSizedGOOGLE",
+    "vkBeginCommandBufferAsyncGOOGLE",
+    "vkEndCommandBufferAsyncGOOGLE",
+    "vkResetCommandBufferAsyncGOOGLE",
+    "vkCommandBufferHostSyncGOOGLE",
+    "vkCreateImageWithRequirementsGOOGLE",
+    "vkCreateBufferWithRequirementsGOOGLE",
+    "vkGetMemoryHostAddressInfoGOOGLE",
+    "vkFreeMemorySyncGOOGLE",
+    "vkQueueHostSyncGOOGLE",
+    "vkQueueSubmitAsyncGOOGLE",
+    "vkQueueWaitIdleAsyncGOOGLE",
+    "vkQueueBindSparseAsyncGOOGLE",
+    "vkGetLinearImageLayoutGOOGLE",
+    "vkGetLinearImageLayout2GOOGLE",
+    "vkQueueFlushCommandsGOOGLE",
+    "vkQueueCommitDescriptorSetUpdatesGOOGLE",
+    "vkCollectDescriptorPoolIdsGOOGLE",
+    "vkQueueSignalReleaseImageANDROIDAsyncGOOGLE",
+    "vkQueueFlushCommandsFromAuxMemoryGOOGLE",
+    "vkGetBlobGOOGLE",
+    "vkUpdateDescriptorSetWithTemplateSized2GOOGLE",
+    "vkQueueSubmitAsync2GOOGLE",
+    "vkGetSemaphoreGOOGLE",
+    "vkTraceAsyncGOOGLE",
 ]
 
 # Handles that need to be translated to/from their corresponding gfxstream object types