[vulkan] don't marshal unions by marshaling every member (guest)
bug: 111137294
Change-Id: Ice7b1a7f362a5b5da06afdf1e953581fd59cbe25
diff --git a/system/vulkan_enc/goldfish_vk_marshaling_guest.cpp b/system/vulkan_enc/goldfish_vk_marshaling_guest.cpp
index 811b7ba..0b64c0f 100644
--- a/system/vulkan_enc/goldfish_vk_marshaling_guest.cpp
+++ b/system/vulkan_enc/goldfish_vk_marshaling_guest.cpp
@@ -3046,8 +3046,6 @@
const VkClearColorValue* forMarshaling)
{
vkStream->write((float*)forMarshaling->float32, 4 * sizeof(float));
- vkStream->write((int32_t*)forMarshaling->int32, 4 * sizeof(int32_t));
- vkStream->write((uint32_t*)forMarshaling->uint32, 4 * sizeof(uint32_t));
}
void unmarshal_VkClearColorValue(
@@ -3055,8 +3053,6 @@
VkClearColorValue* forUnmarshaling)
{
vkStream->read((float*)forUnmarshaling->float32, 4 * sizeof(float));
- vkStream->read((int32_t*)forUnmarshaling->int32, 4 * sizeof(int32_t));
- vkStream->read((uint32_t*)forUnmarshaling->uint32, 4 * sizeof(uint32_t));
}
void marshal_VkClearDepthStencilValue(
@@ -3080,7 +3076,6 @@
const VkClearValue* forMarshaling)
{
marshal_VkClearColorValue(vkStream, (VkClearColorValue*)(&forMarshaling->color));
- marshal_VkClearDepthStencilValue(vkStream, (VkClearDepthStencilValue*)(&forMarshaling->depthStencil));
}
void unmarshal_VkClearValue(
@@ -3088,7 +3083,6 @@
VkClearValue* forUnmarshaling)
{
unmarshal_VkClearColorValue(vkStream, (VkClearColorValue*)(&forUnmarshaling->color));
- unmarshal_VkClearDepthStencilValue(vkStream, (VkClearDepthStencilValue*)(&forUnmarshaling->depthStencil));
}
void marshal_VkClearAttachment(