commit 5974722b67526d75e6427421917f5e3a3c187ffa
author David Reveman <reveman@google.com> Thu Mar 28 09:55:32 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Mar 28 09:55:32 2019 -0700
tree bd56a1f2355ddfd7071ba856b99ecd2e889c0b55
parent 59aa930561c25b808aeef18a48aa4f32c8c0f877
parent 3dbfc15d1f774a796c247d5850cd9ae035ad4a5c

[vulkan] Small fuchsia external semaphore cleanup am: 60d3b975a1 am: 4c3a2c748e
am: 3dbfc15d1f

Change-Id: If678cc0c7c1fbac7f7b75c80af7d3d1a62f0d874

system/vulkan_enc/ResourceTracker.cpp

diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index a723a72..e81db4a 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -53,7 +53,6 @@
 #include <lib/fdio/fd.h>
 #include <lib/fdio/fdio.h>
 #include <lib/fdio/io.h>
-#include <lib/fzl/fdio.h>
 #include <lib/zx/channel.h>
 #include <zircon/process.h>
 #include <zircon/syscalls.h>
@@ -2460,19 +2459,13 @@
                 VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_CREATE_INFO_KHR);
 
 #ifdef VK_USE_PLATFORM_FUCHSIA
-        // vk_init_struct_chain initializes pNext to nullptr
-        vk_struct_common* structChain = vk_init_struct_chain(
-            (vk_struct_common*)(&finalCreateInfo));
+        bool exportEvent = exportSemaphoreInfoPtr &&
+            (exportSemaphoreInfoPtr->handleTypes &
+             VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA);
 
-        bool exportFence = false;
-
-        if (exportSemaphoreInfoPtr) {
-            exportFence =
-                exportSemaphoreInfoPtr->handleTypes &
-                VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA;
-            // TODO: add host side export struct info.
+        if (exportEvent) {
+            finalCreateInfo.pNext = nullptr;
         }
-
 #endif
 
 #ifdef VK_USE_PLATFORM_ANDROID_KHR
@@ -2490,7 +2483,7 @@
         zx_handle_t event_handle = ZX_HANDLE_INVALID;
 
 #ifdef VK_USE_PLATFORM_FUCHSIA
-        if (exportFence) {
+        if (exportEvent) {
             zx_event_create(0, &event_handle);
         }
 #endif