Mesa (staging/22.1): dzn: Pass the dzn_event pointer to _mesa_hash_table_insert()

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: ff7e8aec043460659b4e94646c70d8d0b9871aeb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ff7e8aec043460659b4e94646c70d8d0b9871aeb

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Fri Apr 22 10:57:42 2022 -0700

dzn: Pass the dzn_event pointer to _mesa_hash_table_insert()

The key is supposed to be the dzn_event pointer, not the VkEvent
object, even if they do match in practice on 64bit builds.

Fixes: a012b219640 ("microsoft: Initial vulkan-on-12 driver")
Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16109>
(cherry picked from commit 3328f6be062dbd197fd1efe207364bd07c153bd5)

---

 .pick_status.json                       | 2 +-
 src/microsoft/vulkan/dzn_cmd_buffer.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index d6e7cac9abf..71551fb051c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -454,7 +454,7 @@
         "description": "dzn: Pass the dzn_event pointer to _mesa_hash_table_insert()",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "a012b219640e875aa552b37dfdaf69336d5863c7"
     },
diff --git a/src/microsoft/vulkan/dzn_cmd_buffer.cpp b/src/microsoft/vulkan/dzn_cmd_buffer.cpp
index 0a1a6047d11..0271aa309b0 100644
--- a/src/microsoft/vulkan/dzn_cmd_buffer.cpp
+++ b/src/microsoft/vulkan/dzn_cmd_buffer.cpp
@@ -3788,7 +3788,7 @@ dzn_CmdResetEvent(VkCommandBuffer commandBuffer,
    dzn_device *device = container_of(cmdbuf->vk.base.device, dzn_device, vk);
    VK_FROM_HANDLE(dzn_event, evt, event);
 
-   if (!_mesa_hash_table_insert(cmdbuf->events.ht, event, (void *)(uintptr_t)DZN_EVENT_STATE_RESET))
+   if (!_mesa_hash_table_insert(cmdbuf->events.ht, evt, (void *)(uintptr_t)DZN_EVENT_STATE_RESET))
       cmdbuf->error = vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
 }
 
@@ -3801,7 +3801,7 @@ dzn_CmdSetEvent(VkCommandBuffer commandBuffer,
    dzn_device *device = container_of(cmdbuf->vk.base.device, dzn_device, vk);
    VK_FROM_HANDLE(dzn_event, evt, event);
 
-   if (!_mesa_hash_table_insert(cmdbuf->events.ht, event, (void *)(uintptr_t)DZN_EVENT_STATE_SET))
+   if (!_mesa_hash_table_insert(cmdbuf->events.ht, evt, (void *)(uintptr_t)DZN_EVENT_STATE_SET))
       cmdbuf->error = vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
 }