diff options
| author | Chris Forbes <chrisforbes@google.com> | 2016-10-04 10:08:31 +1300 |
|---|---|---|
| committer | Chris Forbes <chrisforbes@google.com> | 2016-10-04 10:54:45 +1300 |
| commit | 7ed59dd114b121939d5aaca2947a102ed2174df8 (patch) | |
| tree | d55e1fd561831020f38bfc7400993c9ae393fcd6 /layers/object_tracker.cpp | |
| parent | ba097441ea96ea938411c8c55d383b16b01a51b6 (diff) | |
| download | usermoji-7ed59dd114b121939d5aaca2947a102ed2174df8.tar.xz | |
layers: Be careful about casts. ptr -> uint64_t& isnt right on 32bit.
Signed-off-by: Chris Forbes <chrisforbes@google.com>
Diffstat (limited to 'layers/object_tracker.cpp')
| -rw-r--r-- | layers/object_tracker.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/layers/object_tracker.cpp b/layers/object_tracker.cpp index 13e1502b..0a8f7a70 100644 --- a/layers/object_tracker.cpp +++ b/layers/object_tracker.cpp @@ -33,6 +33,7 @@ #include <string.h> #include <unordered_map> +#include <type_traits> #include "vk_layer_config.h" #include "vk_layer_data.h" @@ -245,7 +246,10 @@ static void CreateSwapchainImageObject(VkDevice dispatchable_object, VkImage swa template <typename T1, typename T2> static void CreateObject(T1 dispatchable_object, T2 object, VkDebugReportObjectTypeEXT object_type, bool custom_allocator) { layer_data *instance_data = get_my_data_ptr(get_dispatch_key(dispatchable_object), layer_data_map); - auto object_handle = reinterpret_cast<uint64_t &>(object); + + auto object_handle = std::is_pointer<T2>::value + ? reinterpret_cast<uint64_t>(object) + : reinterpret_cast<uint64_t &>(object); log_msg(instance_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, object_type, object_handle, __LINE__, OBJTRACK_NONE, LayerName, "OBJ[0x%" PRIxLEAST64 "] : CREATE %s object 0x%" PRIxLEAST64, object_track_index++, @@ -264,7 +268,9 @@ template <typename T1, typename T2> static void DestroyObject(T1 dispatchable_object, T2 object, VkDebugReportObjectTypeEXT object_type, bool custom_allocator) { layer_data *device_data = get_my_data_ptr(get_dispatch_key(dispatchable_object), layer_data_map); - uint64_t object_handle = reinterpret_cast<uint64_t &>(object); + auto object_handle = std::is_pointer<T2>::value + ? reinterpret_cast<uint64_t>(object) + : reinterpret_cast<uint64_t &>(object); auto item = device_data->object_map[object_type].find(object_handle); if (item != device_data->object_map[object_type].end()) { @@ -305,7 +311,9 @@ static bool ValidateObject(T1 dispatchable_object, T2 object, VkDebugReportObjec if (null_allowed && (object == VK_NULL_HANDLE)) { return false; } - auto object_handle = reinterpret_cast<uint64_t &>(object); + auto object_handle = std::is_pointer<T2>::value + ? reinterpret_cast<uint64_t>(object) + : reinterpret_cast<uint64_t &>(object); layer_data *device_data = get_my_data_ptr(get_dispatch_key(dispatchable_object), layer_data_map); if (device_data->object_map[object_type].find(object_handle) == device_data->object_map[object_type].end()) { // If object is an image, also look for it in the swapchain image map |