Build fix after vk1.3 update am: 5916c2d42b am: 571d67f8f1

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/vulkan-cereal/+/24558422

Change-Id: I9234dbab54429df6549eb0ddab0491f9f564e2eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3 files changed, 8 insertions, 8 deletions

diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_marshaling.cpp b/stream-servers/vulkan/cereal/common/goldfish_vk_marshaling.cpp
index e2d9ba0a..3df97465 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_marshaling.cpp
+++ b/stream-servers/vulkan/cereal/common/goldfish_vk_marshaling.cpp
@@ -17409,8 +17409,8 @@ void marshal_VkNativeBufferANDROID(VulkanStream* vkStream, VkStructureType rootT
     vkStream->write((int*)&forMarshaling->stride, sizeof(int));
     vkStream->write((int*)&forMarshaling->format, sizeof(int));
     vkStream->write((int*)&forMarshaling->usage, sizeof(int));
-    vkStream->write((uint64_t*)&forMarshaling->consumer, sizeof(uint64_t));
-    vkStream->write((uint64_t*)&forMarshaling->producer, sizeof(uint64_t));
+    vkStream->write((uint64_t*)&forMarshaling->usage2.consumer, sizeof(uint64_t));
+    vkStream->write((uint64_t*)&forMarshaling->usage2.producer, sizeof(uint64_t));
 }
 
 void unmarshal_VkNativeBufferANDROID(VulkanStream* vkStream, VkStructureType rootType,
@@ -17442,8 +17442,8 @@ void unmarshal_VkNativeBufferANDROID(VulkanStream* vkStream, VkStructureType roo
     vkStream->read((int*)&forUnmarshaling->stride, sizeof(int));
     vkStream->read((int*)&forUnmarshaling->format, sizeof(int));
     vkStream->read((int*)&forUnmarshaling->usage, sizeof(int));
-    vkStream->read((uint64_t*)&forUnmarshaling->consumer, sizeof(uint64_t));
-    vkStream->read((uint64_t*)&forUnmarshaling->producer, sizeof(uint64_t));
+    vkStream->read((uint64_t*)&forUnmarshaling->usage2.consumer, sizeof(uint64_t));
+    vkStream->read((uint64_t*)&forUnmarshaling->usage2.producer, sizeof(uint64_t));
 }
 
 #endif
diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_reserved_marshaling.cpp b/stream-servers/vulkan/cereal/common/goldfish_vk_reserved_marshaling.cpp
index c49f4783..b97730a6 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_reserved_marshaling.cpp
+++ b/stream-servers/vulkan/cereal/common/goldfish_vk_reserved_marshaling.cpp
@@ -13555,9 +13555,9 @@ void reservedunmarshal_VkNativeBufferANDROID(VulkanStream* vkStream, VkStructure
     *ptr += sizeof(int);
     memcpy((int*)&forUnmarshaling->usage, *ptr, sizeof(int));
     *ptr += sizeof(int);
-    memcpy((uint64_t*)&forUnmarshaling->consumer, *ptr, sizeof(uint64_t));
+    memcpy((uint64_t*)&forUnmarshaling->usage2.consumer, *ptr, sizeof(uint64_t));
     *ptr += sizeof(uint64_t);
-    memcpy((uint64_t*)&forUnmarshaling->producer, *ptr, sizeof(uint64_t));
+    memcpy((uint64_t*)&forUnmarshaling->usage2.producer, *ptr, sizeof(uint64_t));
     *ptr += sizeof(uint64_t);
 }
 
diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_testing.cpp b/stream-servers/vulkan/cereal/common/goldfish_vk_testing.cpp
index 19450c0b..f6659069 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_testing.cpp
+++ b/stream-servers/vulkan/cereal/common/goldfish_vk_testing.cpp
@@ -9854,10 +9854,10 @@ void checkEqual_VkNativeBufferANDROID(const VkNativeBufferANDROID* a,
     if (!((a->usage) == (b->usage))) {
         onFail("a->usage (Error: Value not equal)");
     };
-    if (!((a->consumer) == (b->consumer))) {
+    if (!((a->usage2.consumer) == (b->usage2.consumer))) {
         onFail("a->consumer (Error: Value not equal)");
     };
-    if (!((a->producer) == (b->producer))) {
+    if (!((a->usage2.producer) == (b->usage2.producer))) {
         onFail("a->producer (Error: Value not equal)");
     };
 }