Revert^2 "Rerun codegen" am: a6ed9fbef8
Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/1917140
Change-Id: If0bcd6f1f3624ff4010316a4d8c051c5f7f524af
diff --git a/system/vulkan_enc/goldfish_vk_marshaling_guest.cpp b/system/vulkan_enc/goldfish_vk_marshaling_guest.cpp
index 5b5f3a3..09bf7b9 100644
--- a/system/vulkan_enc/goldfish_vk_marshaling_guest.cpp
+++ b/system/vulkan_enc/goldfish_vk_marshaling_guest.cpp
@@ -10132,21 +10132,10 @@
const VkXcbSurfaceCreateInfoKHR* forMarshaling)
{
(void)rootType;
- vkStream->write((VkStructureType*)&forMarshaling->sType, sizeof(VkStructureType));
- if (rootType == VK_STRUCTURE_TYPE_MAX_ENUM)
- {
- rootType = forMarshaling->sType;
- }
- marshal_extension_struct(vkStream, rootType, forMarshaling->pNext);
- vkStream->write((VkXcbSurfaceCreateFlagsKHR*)&forMarshaling->flags, sizeof(VkXcbSurfaceCreateFlagsKHR));
- // WARNING PTR CHECK
- uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->connection;
- vkStream->putBe64(cgen_var_0);
- if (forMarshaling->connection)
- {
- vkStream->write((xcb_connection_t*)forMarshaling->connection, sizeof(xcb_connection_t));
- }
- vkStream->write((xcb_window_t*)&forMarshaling->window, sizeof(xcb_window_t));
+
+ // This struct should never be marshaled / unmarshaled.
+ __builtin_trap();
+
}
void unmarshal_VkXcbSurfaceCreateInfoKHR(
@@ -10155,25 +10144,10 @@
VkXcbSurfaceCreateInfoKHR* forUnmarshaling)
{
(void)rootType;
- vkStream->read((VkStructureType*)&forUnmarshaling->sType, sizeof(VkStructureType));
- if (rootType == VK_STRUCTURE_TYPE_MAX_ENUM)
- {
- rootType = forUnmarshaling->sType;
- }
- unmarshal_extension_struct(vkStream, rootType, (void*)(forUnmarshaling->pNext));
- vkStream->read((VkXcbSurfaceCreateFlagsKHR*)&forUnmarshaling->flags, sizeof(VkXcbSurfaceCreateFlagsKHR));
- // WARNING PTR CHECK
- xcb_connection_t* check_connection;
- check_connection = (xcb_connection_t*)(uintptr_t)vkStream->getBe64();
- if (forUnmarshaling->connection)
- {
- if (!(check_connection))
- {
- fprintf(stderr, "fatal: forUnmarshaling->connection inconsistent between guest and host\n");
- }
- vkStream->read((xcb_connection_t*)forUnmarshaling->connection, sizeof(xcb_connection_t));
- }
- vkStream->read((xcb_window_t*)&forUnmarshaling->window, sizeof(xcb_window_t));
+
+ // This struct should never be marshaled / unmarshaled.
+ __builtin_trap();
+
}
#endif
@@ -19216,20 +19190,10 @@
const VkMetalSurfaceCreateInfoEXT* forMarshaling)
{
(void)rootType;
- vkStream->write((VkStructureType*)&forMarshaling->sType, sizeof(VkStructureType));
- if (rootType == VK_STRUCTURE_TYPE_MAX_ENUM)
- {
- rootType = forMarshaling->sType;
- }
- marshal_extension_struct(vkStream, rootType, forMarshaling->pNext);
- vkStream->write((VkMetalSurfaceCreateFlagsEXT*)&forMarshaling->flags, sizeof(VkMetalSurfaceCreateFlagsEXT));
- // WARNING PTR CHECK
- uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pLayer;
- vkStream->putBe64(cgen_var_0);
- if (forMarshaling->pLayer)
- {
- vkStream->write((const CAMetalLayer*)forMarshaling->pLayer, sizeof(const CAMetalLayer));
- }
+
+ // This struct should never be marshaled / unmarshaled.
+ __builtin_trap();
+
}
void unmarshal_VkMetalSurfaceCreateInfoEXT(
@@ -19238,24 +19202,10 @@
VkMetalSurfaceCreateInfoEXT* forUnmarshaling)
{
(void)rootType;
- vkStream->read((VkStructureType*)&forUnmarshaling->sType, sizeof(VkStructureType));
- if (rootType == VK_STRUCTURE_TYPE_MAX_ENUM)
- {
- rootType = forUnmarshaling->sType;
- }
- unmarshal_extension_struct(vkStream, rootType, (void*)(forUnmarshaling->pNext));
- vkStream->read((VkMetalSurfaceCreateFlagsEXT*)&forUnmarshaling->flags, sizeof(VkMetalSurfaceCreateFlagsEXT));
- // WARNING PTR CHECK
- const CAMetalLayer* check_pLayer;
- check_pLayer = (const CAMetalLayer*)(uintptr_t)vkStream->getBe64();
- if (forUnmarshaling->pLayer)
- {
- if (!(check_pLayer))
- {
- fprintf(stderr, "fatal: forUnmarshaling->pLayer inconsistent between guest and host\n");
- }
- vkStream->read((CAMetalLayer*)forUnmarshaling->pLayer, sizeof(const CAMetalLayer));
- }
+
+ // This struct should never be marshaled / unmarshaled.
+ __builtin_trap();
+
}
#endif
diff --git a/system/vulkan_enc/goldfish_vk_reserved_marshaling_guest.cpp b/system/vulkan_enc/goldfish_vk_reserved_marshaling_guest.cpp
index e4bf00d..c09d716 100644
--- a/system/vulkan_enc/goldfish_vk_reserved_marshaling_guest.cpp
+++ b/system/vulkan_enc/goldfish_vk_reserved_marshaling_guest.cpp
@@ -6937,29 +6937,10 @@
const VkXcbSurfaceCreateInfoKHR* forMarshaling,
uint8_t** ptr)
{
- (void)vkStream;
- (void)rootType;
- memcpy(*ptr, (VkStructureType*)&forMarshaling->sType, sizeof(VkStructureType));
- *ptr += sizeof(VkStructureType);
- if (rootType == VK_STRUCTURE_TYPE_MAX_ENUM)
- {
- rootType = forMarshaling->sType;
- }
- reservedmarshal_extension_struct(vkStream, rootType, forMarshaling->pNext, ptr);
- memcpy(*ptr, (VkXcbSurfaceCreateFlagsKHR*)&forMarshaling->flags, sizeof(VkXcbSurfaceCreateFlagsKHR));
- *ptr += sizeof(VkXcbSurfaceCreateFlagsKHR);
- // WARNING PTR CHECK
- uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->connection;
- memcpy((*ptr), &cgen_var_0, 8);
- android::base::Stream::toBe64((uint8_t*)(*ptr));
- *ptr += 8;
- if (forMarshaling->connection)
- {
- memcpy(*ptr, (xcb_connection_t*)forMarshaling->connection, sizeof(xcb_connection_t));
- *ptr += sizeof(xcb_connection_t);
- }
- memcpy(*ptr, (xcb_window_t*)&forMarshaling->window, sizeof(xcb_window_t));
- *ptr += sizeof(xcb_window_t);
+
+ // This struct should never be marshaled / unmarshaled.
+ __builtin_trap();
+
}
#endif
@@ -12907,27 +12888,10 @@
const VkMetalSurfaceCreateInfoEXT* forMarshaling,
uint8_t** ptr)
{
- (void)vkStream;
- (void)rootType;
- memcpy(*ptr, (VkStructureType*)&forMarshaling->sType, sizeof(VkStructureType));
- *ptr += sizeof(VkStructureType);
- if (rootType == VK_STRUCTURE_TYPE_MAX_ENUM)
- {
- rootType = forMarshaling->sType;
- }
- reservedmarshal_extension_struct(vkStream, rootType, forMarshaling->pNext, ptr);
- memcpy(*ptr, (VkMetalSurfaceCreateFlagsEXT*)&forMarshaling->flags, sizeof(VkMetalSurfaceCreateFlagsEXT));
- *ptr += sizeof(VkMetalSurfaceCreateFlagsEXT);
- // WARNING PTR CHECK
- uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pLayer;
- memcpy((*ptr), &cgen_var_0, 8);
- android::base::Stream::toBe64((uint8_t*)(*ptr));
- *ptr += 8;
- if (forMarshaling->pLayer)
- {
- memcpy(*ptr, (const CAMetalLayer*)forMarshaling->pLayer, sizeof(const CAMetalLayer));
- *ptr += sizeof(const CAMetalLayer);
- }
+
+ // This struct should never be marshaled / unmarshaled.
+ __builtin_trap();
+
}
#endif