commit cf6c13da128744c2931303af8d4d4ec4d9e4310c
author David Reveman <reveman@google.com> Mon Jun 10 19:08:30 2019 -0400
committer David Reveman <reveman@google.com> Mon Jun 10 19:08:30 2019 -0400
tree 3a019783fd7dc7fa2d1c57f6a3c114d9582f51ae
parent cb4be1ed517b82ef0052b79f4c3e3685784a1285

[vulkan] Remove temporary external image workaround.

Fuchsia platform code has been updated to use this extension
correctly. The workaround is no longer needed.

Change-Id: I7d378713d61f91fa7184f6e346ec1d99a859174c

system/vulkan_enc/ResourceTracker.cpp

diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index 4aa06e7..4eeeb22 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -2202,22 +2202,6 @@
                 }
             }
         }
-
-        // Allow external memory for all color attachments on fuchsia.
-        // Note: This causes external to be set to true below. The result
-        // is that a dedicated memory allocation is required for the image,
-        // which allows the memory to be exported.
-        // TODO(reveman): Remove this when Fuchsia code is explicitly
-        // specifying external memory image info.
-        if (localCreateInfo.usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT) {
-            if (!extImgCiPtr) {
-                localExtImgCi.sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO;
-                localExtImgCi.pNext = nullptr;
-                localExtImgCi.handleTypes = ~0; // handle type just needs to be non-zero
-                extImgCiPtr = &localExtImgCi;
-                vk_append_struct(&structChainIter, &localExtImgCi);
-            }
-        }
 #endif
 
         VkResult res = enc->vkCreateImage(device, &localCreateInfo, pAllocator, pImage);