commit 212c024add1d27e8904439ff2d97da81f62251f3
author David Reveman <reveman@google.com> Thu Apr 04 12:40:50 2019 -0400
committer David Reveman <reveman@google.com> Fri Apr 05 19:13:19 2019 -0400
tree 1c2395b4e3aa34a1f44a40852151b8aebe46221e
parent d5d92d69391514b10d15c255697bd1b62b78c9fb

[vulkan] Use VMO memory instead of cookie

Use VMO memory instead of cookie for association between
VMOs and color buffers.

Change-Id: I86b20e10a1c0a6ae4ec61b436b81e776f9aa3583

system/vulkan_enc/ResourceTracker.cpp

diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index 01ad42b..c8e44b2 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -1698,10 +1698,17 @@
         }
 
         if (vmo_handle != ZX_HANDLE_INVALID) {
-            uint64_t cb = 0;
+            uint32_t cb = 0;
 
 #ifdef VK_USE_PLATFORM_FUCHSIA
-            zx_object_get_cookie(vmo_handle, vmo_handle, &cb);
+            // TODO(reveman): Remove use of zx_vmo_read. Goldfish FIDL interface
+            // should provide a mechanism to query the color buffer ID associated
+            // with a VMO.
+            zx_status_t status = zx_vmo_read(vmo_handle, &cb, 0, sizeof(cb));
+            if (status != ZX_OK) {
+                ALOGE("failed to read color buffer name");
+                return VK_ERROR_INITIALIZATION_FAILED;
+            }
 #endif
 
             if (cb) {
@@ -2377,11 +2384,12 @@
                     abort();
                 }
             }
-            status = zx_object_set_cookie(memoryInfo.vmoHandle,
-                                          memoryInfo.vmoHandle,
-                                          imageInfo.cbHandle);
+            // TODO(reveman): Remove use of zx_vmo_write. Sysmem
+            // and goldfish pipe driver should manage this association.
+            status = zx_vmo_write(memoryInfo.vmoHandle, &imageInfo.cbHandle,
+                                  0, sizeof(imageInfo.cbHandle));
             if (status != ZX_OK) {
-                ALOGE("%s: failed to set color buffer cookie", __func__);
+                ALOGE("%s: failed writing color buffer id to vmo", __func__);
                 abort();
             }
             // Color buffer backed images are already bound.