Revert "Revert "Fix VkImageCreateInfo mismatch for AHB sibling V..."
Revert "Revert "Fix VkImageCreateInfo mismatch for AHB sibling V..."
Revert submission 1913972-revert-1909696-aosp-image-ci-mismatch-NCXVEHFTRL
Reason for revert: Reland mismatch VkImageCreateInfo for AHB sibiling VkImage.
Reverted Changes:
I70044e66c:Revert "vulkan-cereal: Remove marshaling/decoding ...
Ifaca8d3e0:Revert "Reland "macOS: Remove Vulkan cereal marsha...
If0baa330b:Revert "Regenerate Vulkan sources"
I84a310fac:Revert "Fix VkImageCreateInfo mismatch for AHB sib...
Id8293bddc:Revert "Rerun codegen"
I0931036ca:Revert "Fix VkImageCreateInfo mismatch for AHB sib...
Ifae1da6bf:Revert "Remove trailing semicolon for DEFINE_ALIAS...
I9dfda4c0e:Revert "Fix VkImageCreateInfo mismatch for AHB sib...
Change-Id: I5c98feb0e09d3f535e558db986b0c2846608308a
diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index 3d2dba9..ba94fa9 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -8426,6 +8426,9 @@
void ResourceTracker::transformImpl_VkExternalMemoryProperties_tohost(
VkExternalMemoryProperties*, uint32_t) {}
+void ResourceTracker::transformImpl_VkImageCreateInfo_tohost(VkImageCreateInfo*,
+ uint32_t) {}
+
#define DEFINE_TRANSFORMED_TYPE_IMPL(type) \
void ResourceTracker::transformImpl_##type##_tohost(type*, uint32_t) {} \
void ResourceTracker::transformImpl_##type##_fromhost(type*, uint32_t) {}
diff --git a/system/vulkan_enc/ResourceTracker.h b/system/vulkan_enc/ResourceTracker.h
index 0e32b7a..32ec01d 100644
--- a/system/vulkan_enc/ResourceTracker.h
+++ b/system/vulkan_enc/ResourceTracker.h
@@ -682,6 +682,7 @@
void transformImpl_VkExternalMemoryProperties_tohost(
VkExternalMemoryProperties* pProperties,
uint32_t);
+ void transformImpl_VkImageCreateInfo_tohost(VkImageCreateInfo*, uint32_t);
#define DEFINE_TRANSFORMED_TYPE_PROTOTYPE(type) \
void transformImpl_##type##_tohost(type*, uint32_t); \
diff --git a/system/vulkan_enc/VkEncoder.cpp b/system/vulkan_enc/VkEncoder.cpp
index b0d2bd1..91a9708 100644
--- a/system/vulkan_enc/VkEncoder.cpp
+++ b/system/vulkan_enc/VkEncoder.cpp
@@ -4341,6 +4341,7 @@
local_pAllocator = nullptr;
if (local_pCreateInfo)
{
+ sResourceTracker->transformImpl_VkImageCreateInfo_tohost(local_pCreateInfo, 1);
transform_tohost_VkImageCreateInfo(sResourceTracker, (VkImageCreateInfo*)(local_pCreateInfo));
}
if (local_pAllocator)
@@ -33580,6 +33581,7 @@
local_pAllocator = nullptr;
if (local_pCreateInfo)
{
+ sResourceTracker->transformImpl_VkImageCreateInfo_tohost(local_pCreateInfo, 1);
transform_tohost_VkImageCreateInfo(sResourceTracker, (VkImageCreateInfo*)(local_pCreateInfo));
}
if (local_pAllocator)
diff --git a/system/vulkan_enc/goldfish_vk_transform_guest.h b/system/vulkan_enc/goldfish_vk_transform_guest.h
index 06371d1..c1fd0b9 100644
--- a/system/vulkan_enc/goldfish_vk_transform_guest.h
+++ b/system/vulkan_enc/goldfish_vk_transform_guest.h
@@ -46,6 +46,7 @@
#define LIST_NON_TRIVIAL_TRANSFORMED_TYPES(f) \
f(VkExternalMemoryProperties) \
+f(VkImageCreateInfo) \
#define LIST_TRANSFORMED_TYPES(f) \
LIST_TRIVIAL_TRANSFORMED_TYPES(f) \
