Mesa (staging/20.0): turnip: Fix compiler warning about casting a nondispatchable handle.

[GitLab Mirror]

Module: Mesa
Branch: staging/20.0
Commit: 8a9f1293b84fb4bcca2bec1eb7cdb298af488d37
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8a9f1293b84fb4bcca2bec1eb7cdb298af488d37

Author: Eric Anholt <eric at anholt.net>
Date:   Fri Feb 21 16:38:26 2020 -0800

turnip: Fix compiler warning about casting a nondispatchable handle.

Fixes: 1c5d84fcae71 ("turnip: hook up cmdbuffer event set/wait")
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3916>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3916>
(cherry picked from commit bd53f4f56b2ca93c1fe4f5af29b5040d2b32e88f)

---

 .pick_status.json                    | 2 +-
 src/freedreno/vulkan/tu_cmd_buffer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 01437af4f88..f1f8086b0b8 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1246,7 +1246,7 @@
         "description": "turnip: Fix compiler warning about casting a nondispatchable handle.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "1c5d84fcae71b40f77891386ac53c8addee4f554"
     },
diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c
index 766279183a7..8135a02fe00 100644
--- a/src/freedreno/vulkan/tu_cmd_buffer.c
+++ b/src/freedreno/vulkan/tu_cmd_buffer.c
@@ -3935,7 +3935,7 @@ tu_CmdWaitEvents(VkCommandBuffer commandBuffer,
    /* TODO: any flush required before/after? (CP_WAIT_FOR_ME?) */
 
    for (uint32_t i = 0; i < eventCount; i++) {
-      const struct tu_event *event = (const struct tu_event*) pEvents[i];
+      TU_FROM_HANDLE(tu_event, event, pEvents[i]);
 
       tu_bo_list_add(&cmd->bo_list, &event->bo, MSM_SUBMIT_BO_READ);