commit b55ed1c1bec0c0625281867d38e55ded225b0800
author Lingfeng Yang <lfy@google.com> Thu Jun 20 15:57:08 2019 -0700
committer Lingfeng Yang <lfy@google.com> Thu Jun 20 16:17:16 2019 -0700
tree cf27023ed6ee372e961f83762fadc0da677e23c2
parent e811b79f1668ac18e76ccc2d902333b1d630f90f

[vulkan] put null optinal string marshaling behind a flag (guest)

bug: 111137294

System images without the support need different marshaling

Change-Id: Iff950810d34d347022deee7928848b5cf7bee544

system/vulkan_enc/VkEncoder.cpp

diff --git a/system/vulkan_enc/VkEncoder.cpp b/system/vulkan_enc/VkEncoder.cpp
index 3b3cd9b..1048141 100644
--- a/system/vulkan_enc/VkEncoder.cpp
+++ b/system/vulkan_enc/VkEncoder.cpp
@@ -944,10 +944,17 @@
     }
     countingStream->rewind();
     {
-        // WARNING PTR CHECK
-        uint64_t cgen_var_53 = (uint64_t)(uintptr_t)local_pLayerName;
-        countingStream->putBe64(cgen_var_53);
-        if (local_pLayerName)
+        if (countingStream->getFeatureBits() & VULKAN_STREAM_FEATURE_NULL_OPTIONAL_STRINGS_BIT)
+        {
+            // WARNING PTR CHECK
+            uint64_t cgen_var_53 = (uint64_t)(uintptr_t)local_pLayerName;
+            countingStream->putBe64(cgen_var_53);
+            if (local_pLayerName)
+            {
+                countingStream->putString(local_pLayerName);
+            }
+        }
+        else
         {
             countingStream->putString(local_pLayerName);
         }
@@ -974,10 +981,17 @@
     uint32_t opcode_vkEnumerateInstanceExtensionProperties = OP_vkEnumerateInstanceExtensionProperties;
     stream->write(&opcode_vkEnumerateInstanceExtensionProperties, sizeof(uint32_t));
     stream->write(&packetSize_vkEnumerateInstanceExtensionProperties, sizeof(uint32_t));
-    // WARNING PTR CHECK
-    uint64_t cgen_var_56 = (uint64_t)(uintptr_t)local_pLayerName;
-    stream->putBe64(cgen_var_56);
-    if (local_pLayerName)
+    if (stream->getFeatureBits() & VULKAN_STREAM_FEATURE_NULL_OPTIONAL_STRINGS_BIT)
+    {
+        // WARNING PTR CHECK
+        uint64_t cgen_var_56 = (uint64_t)(uintptr_t)local_pLayerName;
+        stream->putBe64(cgen_var_56);
+        if (local_pLayerName)
+        {
+            stream->putString(local_pLayerName);
+        }
+    }
+    else
     {
         stream->putString(local_pLayerName);
     }
@@ -1067,10 +1081,17 @@
         uint64_t cgen_var_61;
         countingStream->handleMapping()->mapHandles_VkPhysicalDevice_u64(&local_physicalDevice, &cgen_var_61, 1);
         countingStream->write((uint64_t*)&cgen_var_61, 1 * 8);
-        // WARNING PTR CHECK
-        uint64_t cgen_var_62 = (uint64_t)(uintptr_t)local_pLayerName;
-        countingStream->putBe64(cgen_var_62);
-        if (local_pLayerName)
+        if (countingStream->getFeatureBits() & VULKAN_STREAM_FEATURE_NULL_OPTIONAL_STRINGS_BIT)
+        {
+            // WARNING PTR CHECK
+            uint64_t cgen_var_62 = (uint64_t)(uintptr_t)local_pLayerName;
+            countingStream->putBe64(cgen_var_62);
+            if (local_pLayerName)
+            {
+                countingStream->putString(local_pLayerName);
+            }
+        }
+        else
         {
             countingStream->putString(local_pLayerName);
         }
@@ -1100,10 +1121,17 @@
     uint64_t cgen_var_65;
     stream->handleMapping()->mapHandles_VkPhysicalDevice_u64(&local_physicalDevice, &cgen_var_65, 1);
     stream->write((uint64_t*)&cgen_var_65, 1 * 8);
-    // WARNING PTR CHECK
-    uint64_t cgen_var_66 = (uint64_t)(uintptr_t)local_pLayerName;
-    stream->putBe64(cgen_var_66);
-    if (local_pLayerName)
+    if (stream->getFeatureBits() & VULKAN_STREAM_FEATURE_NULL_OPTIONAL_STRINGS_BIT)
+    {
+        // WARNING PTR CHECK
+        uint64_t cgen_var_66 = (uint64_t)(uintptr_t)local_pLayerName;
+        stream->putBe64(cgen_var_66);
+        if (local_pLayerName)
+        {
+            stream->putString(local_pLayerName);
+        }
+    }
+    else
     {
         stream->putString(local_pLayerName);
     }