commit 04a571917e174e4f1bbda740d8e8d3562ff87d1c
author Lingfeng Yang <lfy@google.com> Thu Dec 20 14:06:45 2018 -0800
committer Lingfeng Yang <lfy@google.com> Thu Dec 20 14:10:32 2018 -0800
tree 4fba24c823272a8c8c55c65b1d38178cafa4bb6f
parent e637ca5bfef9f31b559c3fb040725d8b61cdaf5f

[vulkan] Fix flaky crash

bug: 111137294
Fixes: 120804191

We were chopping off the high 32 bits of all underlying host objects lol

Sometimes this matters :)

Change-Id: I9e22a37ae46f536ec319b287d5f1a844b20724a4

system/vulkan_enc/ResourceTracker.cpp

diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index 3738839..5ac4d7b 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -74,20 +74,20 @@
 #define CREATE_MAPPING_IMPL_FOR_TYPE(type_name) \
     MAKE_HANDLE_MAPPING_FOREACH(type_name, \
         handles[i] = new_from_host_##type_name(handles[i]); ResourceTracker::get()->register_##type_name(handles[i]);, \
-        handle_u64s[i] = (uint64_t)(uintptr_t)new_from_host_##type_name(handles[i]), \
-        handles[i] = (type_name)(uintptr_t)new_from_host_u64_##type_name(handle_u64s[i]); ResourceTracker::get()->register_##type_name(handles[i]);)
+        handle_u64s[i] = (uint64_t)new_from_host_##type_name(handles[i]), \
+        handles[i] = (type_name)new_from_host_u64_##type_name(handle_u64s[i]); ResourceTracker::get()->register_##type_name(handles[i]);)
 
 #define UNWRAP_MAPPING_IMPL_FOR_TYPE(type_name) \
     MAKE_HANDLE_MAPPING_FOREACH(type_name, \
         handles[i] = get_host_##type_name(handles[i]), \
-        handle_u64s[i] = (uint64_t)(uintptr_t)get_host_u64_##type_name(handles[i]), \
-        handles[i] = (type_name)(uintptr_t)get_host_##type_name((type_name)(uintptr_t)handle_u64s[i]))
+        handle_u64s[i] = (uint64_t)get_host_u64_##type_name(handles[i]), \
+        handles[i] = (type_name)get_host_##type_name((type_name)handle_u64s[i]))
 
 #define DESTROY_MAPPING_IMPL_FOR_TYPE(type_name) \
     MAKE_HANDLE_MAPPING_FOREACH(type_name, \
         ResourceTracker::get()->unregister_##type_name(handles[i]); delete_goldfish_##type_name(handles[i]), \
         (void)handle_u64s[i]; delete_goldfish_##type_name(handles[i]), \
-        (void)handles[i]; delete_goldfish_##type_name((type_name)(uintptr_t)handle_u64s[i]))
+        (void)handles[i]; delete_goldfish_##type_name((type_name)handle_u64s[i]))
 
 DEFINE_RESOURCE_TRACKING_CLASS(CreateMapping, CREATE_MAPPING_IMPL_FOR_TYPE)
 DEFINE_RESOURCE_TRACKING_CLASS(UnwrapMapping, UNWRAP_MAPPING_IMPL_FOR_TYPE)

system/vulkan_enc/Resources.cpp

diff --git a/system/vulkan_enc/Resources.cpp b/system/vulkan_enc/Resources.cpp
index a0af80d..b70d222 100644
--- a/system/vulkan_enc/Resources.cpp
+++ b/system/vulkan_enc/Resources.cpp
@@ -37,7 +37,7 @@
             abort(); \
         } \
         res->dispatch.magic = HWVULKAN_DISPATCH_MAGIC; \
-        res->underlying = (uint64_t)(uintptr_t)underlying; \
+        res->underlying = (uint64_t)underlying; \
         return reinterpret_cast<type>(res); \
     } \
 
@@ -45,7 +45,7 @@
     type new_from_host_##type(type underlying) { \
         struct goldfish_##type* res = \
             static_cast<goldfish_##type*>(malloc(sizeof(goldfish_##type))); \
-        res->underlying = (uint64_t)(uintptr_t)underlying; \
+        res->underlying = (uint64_t)underlying; \
         return reinterpret_cast<type>(res); \
     } \
 
@@ -58,7 +58,7 @@
     type get_host_##type(type toUnwrap) { \
         if (!toUnwrap) return VK_NULL_HANDLE; \
         auto as_goldfish = as_goldfish_##type(toUnwrap); \
-        return (type)(uintptr_t)(as_goldfish->underlying); \
+        return (type)(as_goldfish->underlying); \
     } \
 
 #define GOLDFISH_VK_DELETE_GOLDFISH_IMPL(type) \