Mesa (main): dzn: Pass the dzn_event pointer to _mesa_hash_table_insert()

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 3328f6be062dbd197fd1efe207364bd07c153bd5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3328f6be062dbd197fd1efe207364bd07c153bd5

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>

---

 src/microsoft/vulkan/dzn_cmd_buffer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/microsoft/vulkan/dzn_cmd_buffer.c b/src/microsoft/vulkan/dzn_cmd_buffer.c
index dae177e6cdc..374fb06bbff 100644
--- a/src/microsoft/vulkan/dzn_cmd_buffer.c
+++ b/src/microsoft/vulkan/dzn_cmd_buffer.c
@@ -3880,7 +3880,7 @@ dzn_CmdResetEvent(VkCommandBuffer commandBuffer,
    struct dzn_device *device = container_of(cmdbuf->vk.base.device, struct 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);
 }
 
@@ -3893,7 +3893,7 @@ dzn_CmdSetEvent(VkCommandBuffer commandBuffer,
    struct dzn_device *device = container_of(cmdbuf->vk.base.device, struct 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);
 }