commit e4270d111b5c8cdce1864cbf14ebf667efb70f2f
author Antonio Maiorano <amaiorano@google.com> Tue Nov 08 23:24:52 2022 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Nov 08 23:24:52 2022 +0000
tree 0abf3bbc6380337a58b68aa98e89efdcc628cbc8
parent a70e365313d31757bc9b75002fa46b3366d551a8

Fix dawn_native MSVC x86 build

Bug: dawn:1590
Change-Id: I4559a664fde1ee0ebcf7eae44a752d1977a63e24
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/109200
Reviewed-by: Austin Eng <enga@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>

src/dawn/native/vulkan/UtilsVulkan.h

diff --git a/src/dawn/native/vulkan/UtilsVulkan.h b/src/dawn/native/vulkan/UtilsVulkan.h
index 5ccdf0a..2b8bfd1 100644
--- a/src/dawn/native/vulkan/UtilsVulkan.h
+++ b/src/dawn/native/vulkan/UtilsVulkan.h
@@ -124,8 +124,13 @@
                   detail::VkHandle<Tag, HandleType> objectHandle,
                   const char* prefix,
                   std::string label = "") {
-    SetDebugNameInternal(device, GetVkObjectType(objectHandle),
-                         reinterpret_cast<uint64_t>(objectHandle.GetHandle()), prefix, label);
+    uint64_t handle;
+    if constexpr (std::is_same_v<HandleType, uint64_t>) {
+        handle = objectHandle.GetHandle();
+    } else {
+        handle = reinterpret_cast<uint64_t>(objectHandle.GetHandle());
+    }
+    SetDebugNameInternal(device, GetVkObjectType(objectHandle), handle, prefix, label);
 }
 
 // Handles like VkQueue and VKDevice require a special path because they are dispatchable, so