[vulkan] Add VkImportColorBufferGOOGLE/VkImportPhysicalAddressGOOGLE (take codegen)
bug: 122080810
Test: build
Change-Id: Id3d0c747f7da35c81ff6990f8704f68b81878c99
diff --git a/system/vulkan_enc/goldfish_vk_deepcopy_guest.cpp b/system/vulkan_enc/goldfish_vk_deepcopy_guest.cpp
index 68ff572..1626a8a 100644
--- a/system/vulkan_enc/goldfish_vk_deepcopy_guest.cpp
+++ b/system/vulkan_enc/goldfish_vk_deepcopy_guest.cpp
@@ -6347,6 +6347,38 @@
#ifdef VK_GOOGLE_address_space
#endif
#ifdef VK_GOOGLE_color_buffer
+void deepcopy_VkImportColorBufferGOOGLE(
+ Pool* pool,
+ const VkImportColorBufferGOOGLE* from,
+ VkImportColorBufferGOOGLE* to)
+{
+ (void)pool;
+ *to = *from;
+ size_t pNext_size = goldfish_vk_extension_struct_size(from->pNext);
+ to->pNext = nullptr;
+ if (pNext_size)
+ {
+ to->pNext = (void*)pool->alloc(pNext_size);
+ deepcopy_extension_struct(pool, from->pNext, (void*)(to->pNext));
+ }
+}
+
+void deepcopy_VkImportPhysicalAddressGOOGLE(
+ Pool* pool,
+ const VkImportPhysicalAddressGOOGLE* from,
+ VkImportPhysicalAddressGOOGLE* to)
+{
+ (void)pool;
+ *to = *from;
+ size_t pNext_size = goldfish_vk_extension_struct_size(from->pNext);
+ to->pNext = nullptr;
+ if (pNext_size)
+ {
+ to->pNext = (void*)pool->alloc(pNext_size);
+ deepcopy_extension_struct(pool, from->pNext, (void*)(to->pNext));
+ }
+}
+
#endif
void deepcopy_extension_struct(
Pool* pool,
diff --git a/system/vulkan_enc/goldfish_vk_deepcopy_guest.h b/system/vulkan_enc/goldfish_vk_deepcopy_guest.h
index 4a89c03..6b73d1f 100644
--- a/system/vulkan_enc/goldfish_vk_deepcopy_guest.h
+++ b/system/vulkan_enc/goldfish_vk_deepcopy_guest.h
@@ -2011,6 +2011,16 @@
#ifdef VK_GOOGLE_address_space
#endif
#ifdef VK_GOOGLE_color_buffer
+void deepcopy_VkImportColorBufferGOOGLE(
+ Pool* pool,
+ const VkImportColorBufferGOOGLE* from,
+ VkImportColorBufferGOOGLE* to);
+
+void deepcopy_VkImportPhysicalAddressGOOGLE(
+ Pool* pool,
+ const VkImportPhysicalAddressGOOGLE* from,
+ VkImportPhysicalAddressGOOGLE* to);
+
#endif
} // namespace goldfish_vk
diff --git a/system/vulkan_enc/goldfish_vk_handlemap_guest.cpp b/system/vulkan_enc/goldfish_vk_handlemap_guest.cpp
index bd9ae86..8cc6893 100644
--- a/system/vulkan_enc/goldfish_vk_handlemap_guest.cpp
+++ b/system/vulkan_enc/goldfish_vk_handlemap_guest.cpp
@@ -4719,6 +4719,30 @@
#ifdef VK_GOOGLE_address_space
#endif
#ifdef VK_GOOGLE_color_buffer
+void handlemap_VkImportColorBufferGOOGLE(
+ VulkanHandleMapping* handlemap,
+ VkImportColorBufferGOOGLE* toMap)
+{
+ (void)handlemap;
+ (void)toMap;
+ if (toMap->pNext)
+ {
+ handlemap_extension_struct(handlemap, (void*)(toMap->pNext));
+ }
+}
+
+void handlemap_VkImportPhysicalAddressGOOGLE(
+ VulkanHandleMapping* handlemap,
+ VkImportPhysicalAddressGOOGLE* toMap)
+{
+ (void)handlemap;
+ (void)toMap;
+ if (toMap->pNext)
+ {
+ handlemap_extension_struct(handlemap, (void*)(toMap->pNext));
+ }
+}
+
#endif
void handlemap_extension_struct(
VulkanHandleMapping* handlemap,
diff --git a/system/vulkan_enc/goldfish_vk_handlemap_guest.h b/system/vulkan_enc/goldfish_vk_handlemap_guest.h
index 08c5564..c9678d4 100644
--- a/system/vulkan_enc/goldfish_vk_handlemap_guest.h
+++ b/system/vulkan_enc/goldfish_vk_handlemap_guest.h
@@ -1666,6 +1666,14 @@
#ifdef VK_GOOGLE_address_space
#endif
#ifdef VK_GOOGLE_color_buffer
+void handlemap_VkImportColorBufferGOOGLE(
+ VulkanHandleMapping* handlemap,
+ VkImportColorBufferGOOGLE* toMap);
+
+void handlemap_VkImportPhysicalAddressGOOGLE(
+ VulkanHandleMapping* handlemap,
+ VkImportPhysicalAddressGOOGLE* toMap);
+
#endif
} // namespace goldfish_vk
diff --git a/system/vulkan_enc/goldfish_vk_marshaling_guest.cpp b/system/vulkan_enc/goldfish_vk_marshaling_guest.cpp
index b4f2ead..8b47af0 100644
--- a/system/vulkan_enc/goldfish_vk_marshaling_guest.cpp
+++ b/system/vulkan_enc/goldfish_vk_marshaling_guest.cpp
@@ -13366,6 +13366,78 @@
#ifdef VK_GOOGLE_address_space
#endif
#ifdef VK_GOOGLE_color_buffer
+void marshal_VkImportColorBufferGOOGLE(
+ VulkanStream* vkStream,
+ const VkImportColorBufferGOOGLE* forMarshaling)
+{
+ vkStream->write((VkStructureType*)&forMarshaling->sType, sizeof(VkStructureType));
+ size_t pNext_size = goldfish_vk_extension_struct_size(forMarshaling->pNext);
+ vkStream->putBe32(pNext_size);
+ if (pNext_size)
+ {
+ vkStream->write((void*)forMarshaling->pNext, sizeof(VkStructureType));
+ marshal_extension_struct(vkStream, forMarshaling->pNext);
+ }
+ vkStream->write((uint32_t*)&forMarshaling->colorBuffer, sizeof(uint32_t));
+}
+
+void unmarshal_VkImportColorBufferGOOGLE(
+ VulkanStream* vkStream,
+ VkImportColorBufferGOOGLE* forUnmarshaling)
+{
+ vkStream->read((VkStructureType*)&forUnmarshaling->sType, sizeof(VkStructureType));
+ size_t pNext_size;
+ pNext_size = vkStream->getBe32();
+ forUnmarshaling->pNext = nullptr;
+ if (pNext_size)
+ {
+ vkStream->alloc((void**)&forUnmarshaling->pNext, pNext_size);
+ vkStream->read((void*)forUnmarshaling->pNext, sizeof(VkStructureType));
+ unmarshal_extension_struct(vkStream, (void*)(forUnmarshaling->pNext));
+ }
+ vkStream->read((uint32_t*)&forUnmarshaling->colorBuffer, sizeof(uint32_t));
+}
+
+void marshal_VkImportPhysicalAddressGOOGLE(
+ VulkanStream* vkStream,
+ const VkImportPhysicalAddressGOOGLE* forMarshaling)
+{
+ vkStream->write((VkStructureType*)&forMarshaling->sType, sizeof(VkStructureType));
+ size_t pNext_size = goldfish_vk_extension_struct_size(forMarshaling->pNext);
+ vkStream->putBe32(pNext_size);
+ if (pNext_size)
+ {
+ vkStream->write((void*)forMarshaling->pNext, sizeof(VkStructureType));
+ marshal_extension_struct(vkStream, forMarshaling->pNext);
+ }
+ vkStream->write((uint64_t*)&forMarshaling->physicalAddress, sizeof(uint64_t));
+ vkStream->write((VkDeviceSize*)&forMarshaling->size, sizeof(VkDeviceSize));
+ vkStream->write((VkFormat*)&forMarshaling->format, sizeof(VkFormat));
+ vkStream->write((VkImageTiling*)&forMarshaling->tiling, sizeof(VkImageTiling));
+ vkStream->write((uint32_t*)&forMarshaling->tilingParameter, sizeof(uint32_t));
+}
+
+void unmarshal_VkImportPhysicalAddressGOOGLE(
+ VulkanStream* vkStream,
+ VkImportPhysicalAddressGOOGLE* forUnmarshaling)
+{
+ vkStream->read((VkStructureType*)&forUnmarshaling->sType, sizeof(VkStructureType));
+ size_t pNext_size;
+ pNext_size = vkStream->getBe32();
+ forUnmarshaling->pNext = nullptr;
+ if (pNext_size)
+ {
+ vkStream->alloc((void**)&forUnmarshaling->pNext, pNext_size);
+ vkStream->read((void*)forUnmarshaling->pNext, sizeof(VkStructureType));
+ unmarshal_extension_struct(vkStream, (void*)(forUnmarshaling->pNext));
+ }
+ vkStream->read((uint64_t*)&forUnmarshaling->physicalAddress, sizeof(uint64_t));
+ vkStream->read((VkDeviceSize*)&forUnmarshaling->size, sizeof(VkDeviceSize));
+ vkStream->read((VkFormat*)&forUnmarshaling->format, sizeof(VkFormat));
+ vkStream->read((VkImageTiling*)&forUnmarshaling->tiling, sizeof(VkImageTiling));
+ vkStream->read((uint32_t*)&forUnmarshaling->tilingParameter, sizeof(uint32_t));
+}
+
#endif
void marshal_extension_struct(
VulkanStream* vkStream,
diff --git a/system/vulkan_enc/goldfish_vk_marshaling_guest.h b/system/vulkan_enc/goldfish_vk_marshaling_guest.h
index ef3ee5c..966f0bc 100644
--- a/system/vulkan_enc/goldfish_vk_marshaling_guest.h
+++ b/system/vulkan_enc/goldfish_vk_marshaling_guest.h
@@ -3362,6 +3362,22 @@
#define OP_vkMapMemoryIntoAddressSpaceGOOGLE 20317
#endif
#ifdef VK_GOOGLE_color_buffer
+void marshal_VkImportColorBufferGOOGLE(
+ VulkanStream* vkStream,
+ const VkImportColorBufferGOOGLE* forMarshaling);
+
+void unmarshal_VkImportColorBufferGOOGLE(
+ VulkanStream* vkStream,
+ VkImportColorBufferGOOGLE* forUnmarshaling);
+
+void marshal_VkImportPhysicalAddressGOOGLE(
+ VulkanStream* vkStream,
+ const VkImportPhysicalAddressGOOGLE* forMarshaling);
+
+void unmarshal_VkImportPhysicalAddressGOOGLE(
+ VulkanStream* vkStream,
+ VkImportPhysicalAddressGOOGLE* forUnmarshaling);
+
#define OP_vkRegisterImageColorBufferGOOGLE 20318
#define OP_vkRegisterBufferColorBufferGOOGLE 20319
#endif
diff --git a/system/vulkan_enc/goldfish_vk_private_defs.h b/system/vulkan_enc/goldfish_vk_private_defs.h
index f1d066d..77510d5 100644
--- a/system/vulkan_enc/goldfish_vk_private_defs.h
+++ b/system/vulkan_enc/goldfish_vk_private_defs.h
@@ -89,6 +89,27 @@
typedef VkResult (VKAPI_PTR *PFN_vkMapMemoryIntoAddressSpaceGOOGLE)(VkDevice device, VkDeviceMemory memory, uint64_t* pAddress);
#define VK_GOOGLE_color_buffer 1
+#define VK_GOOGLE_COLOR_BUFFER_EXTENSION_NUMBER 219
+
+#define VK_GOOGLE_COLOR_BUFFER_ENUM(type,id) ((type)(1000000000 + (1000 * (VK_GOOGLE_COLOR_BUFFER_EXTENSION_NUMBER - 1)) + (id)))
+#define VK_STRUCTURE_TYPE_IMPORT_COLOR_BUFFER_GOOGLE VK_GOOGLE_COLOR_BUFFER_ENUM(VkStructureType, 0)
+#define VK_STRUCTURE_TYPE_IMPORT_PHYSICAL_ADDRESS_GOOGLE VK_GOOGLE_COLOR_BUFFER_ENUM(VkStructureType, 1)
+
+typedef struct {
+ VkStructureType sType; // must be VK_STRUCTURE_TYPE_IMPORT_COLOR_BUFFER_GOOGLE
+ const void* pNext;
+ uint32_t colorBuffer;
+} VkImportColorBufferGOOGLE;
+
+typedef struct {
+ VkStructureType sType; // must be VK_STRUCTURE_TYPE_IMPORT_PHYSICAL_ADDRESS_GOOGLE
+ const void* pNext;
+ uint64_t physicalAddress;
+ VkDeviceSize size;
+ VkFormat format;
+ VkImageTiling tiling;
+ uint32_t tilingParameter;
+} VkImportPhysicalAddressGOOGLE;
typedef VkResult (VKAPI_PTR *PFN_vkRegisterImageColorBufferGOOGLE)(VkDevice device, VkImage image, uint32_t colorBuffer);
typedef VkResult (VKAPI_PTR *PFN_vkRegisterBufferColorBufferGOOGLE)(VkDevice device, VkBuffer image, uint32_t colorBuffer);
diff --git a/system/vulkan_enc/goldfish_vk_transform_guest.cpp b/system/vulkan_enc/goldfish_vk_transform_guest.cpp
index cf9cdc6..c97e772 100644
--- a/system/vulkan_enc/goldfish_vk_transform_guest.cpp
+++ b/system/vulkan_enc/goldfish_vk_transform_guest.cpp
@@ -8892,6 +8892,54 @@
#ifdef VK_GOOGLE_address_space
#endif
#ifdef VK_GOOGLE_color_buffer
+void transform_tohost_VkImportColorBufferGOOGLE(
+ ResourceTracker* resourceTracker,
+ VkImportColorBufferGOOGLE* toTransform)
+{
+ (void)resourceTracker;
+ (void)toTransform;
+ if (toTransform->pNext)
+ {
+ transform_tohost_extension_struct(resourceTracker, (void*)(toTransform->pNext));
+ }
+}
+
+void transform_fromhost_VkImportColorBufferGOOGLE(
+ ResourceTracker* resourceTracker,
+ VkImportColorBufferGOOGLE* toTransform)
+{
+ (void)resourceTracker;
+ (void)toTransform;
+ if (toTransform->pNext)
+ {
+ transform_fromhost_extension_struct(resourceTracker, (void*)(toTransform->pNext));
+ }
+}
+
+void transform_tohost_VkImportPhysicalAddressGOOGLE(
+ ResourceTracker* resourceTracker,
+ VkImportPhysicalAddressGOOGLE* toTransform)
+{
+ (void)resourceTracker;
+ (void)toTransform;
+ if (toTransform->pNext)
+ {
+ transform_tohost_extension_struct(resourceTracker, (void*)(toTransform->pNext));
+ }
+}
+
+void transform_fromhost_VkImportPhysicalAddressGOOGLE(
+ ResourceTracker* resourceTracker,
+ VkImportPhysicalAddressGOOGLE* toTransform)
+{
+ (void)resourceTracker;
+ (void)toTransform;
+ if (toTransform->pNext)
+ {
+ transform_fromhost_extension_struct(resourceTracker, (void*)(toTransform->pNext));
+ }
+}
+
#endif
void transform_tohost_extension_struct(
ResourceTracker* resourceTracker,
diff --git a/system/vulkan_enc/goldfish_vk_transform_guest.h b/system/vulkan_enc/goldfish_vk_transform_guest.h
index 0ef2144..c7fb7d0 100644
--- a/system/vulkan_enc/goldfish_vk_transform_guest.h
+++ b/system/vulkan_enc/goldfish_vk_transform_guest.h
@@ -3046,6 +3046,22 @@
#ifdef VK_GOOGLE_address_space
#endif
#ifdef VK_GOOGLE_color_buffer
+void transform_tohost_VkImportColorBufferGOOGLE(
+ ResourceTracker* resourceTracker,
+ VkImportColorBufferGOOGLE* toTransform);
+
+void transform_fromhost_VkImportColorBufferGOOGLE(
+ ResourceTracker* resourceTracker,
+ VkImportColorBufferGOOGLE* toTransform);
+
+void transform_tohost_VkImportPhysicalAddressGOOGLE(
+ ResourceTracker* resourceTracker,
+ VkImportPhysicalAddressGOOGLE* toTransform);
+
+void transform_fromhost_VkImportPhysicalAddressGOOGLE(
+ ResourceTracker* resourceTracker,
+ VkImportPhysicalAddressGOOGLE* toTransform);
+
#endif
} // namespace goldfish_vk
