From aefd3d835ea75c66a69201e308ef9f2055f80747 Mon Sep 17 00:00:00 2001
From: Derek Foreman <derek.foreman@collabora.com>
Date: Thu, 12 Dec 2024 09:47:14 -0600
Subject: [PATCH] wsi/wayland: Move buffer name string into common code

Push this into the loader bits so it will be available to egl when we
add profiling later.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32757>
---
 src/loader/loader_wayland_helper.c  | 16 +++++++++++++++
 src/loader/loader_wayland_helper.h  |  1 +
 src/vulkan/wsi/wsi_common_wayland.c | 31 +++++++++--------------------
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/loader/loader_wayland_helper.c b/src/loader/loader_wayland_helper.c
index 9a7ebbef449..c6979e1a33e 100644
--- a/src/loader/loader_wayland_helper.c
+++ b/src/loader/loader_wayland_helper.c
@@ -22,6 +22,8 @@
 
 #include <poll.h>
 #include <errno.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "util/perf/cpu_trace.h"
 
@@ -164,6 +166,17 @@ loader_wayland_dispatch(struct wl_display *wl_display,
                                             &remaining_timeout);
 }
 
+static char *
+stringify_wayland_id(uint32_t id)
+{
+   char *out;
+
+   if (asprintf(&out, "wl%d", id) < 0)
+      return strdup("Wayland buffer");
+
+   return out;
+}
+
 void
 loader_wayland_wrap_buffer(struct loader_wayland_buffer *lwb,
                            struct wl_buffer *wl_buffer)
@@ -171,6 +184,7 @@ loader_wayland_wrap_buffer(struct loader_wayland_buffer *lwb,
    lwb->buffer = wl_buffer;
    lwb->id = wl_proxy_get_id((struct wl_proxy *)wl_buffer);
    lwb->flow_id = 0;
+   lwb->name = stringify_wayland_id(lwb->id);
 }
 
 void
@@ -180,6 +194,8 @@ loader_wayland_buffer_destroy(struct loader_wayland_buffer *lwb)
    lwb->buffer = NULL;
    lwb->id = 0;
    lwb->flow_id = 0;
+   free(lwb->name);
+   lwb->name = NULL;
 }
 
 void
diff --git a/src/loader/loader_wayland_helper.h b/src/loader/loader_wayland_helper.h
index 816e638d093..27a47aaf131 100644
--- a/src/loader/loader_wayland_helper.h
+++ b/src/loader/loader_wayland_helper.h
@@ -30,6 +30,7 @@ struct loader_wayland_buffer {
    struct wl_buffer *buffer;
    uint32_t id;
    uint64_t flow_id;
+   char *name;
 };
 
 #ifndef HAVE_WL_DISPATCH_QUEUE_TIMEOUT
diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c
index 5b8edfdd35d..dce0316c022 100644
--- a/src/vulkan/wsi/wsi_common_wayland.c
+++ b/src/vulkan/wsi/wsi_common_wayland.c
@@ -290,17 +290,6 @@ find_format(struct u_vector *formats, VkFormat format)
    return NULL;
 }
 
-static char *
-stringify_wayland_id(uint32_t id)
-{
-   char *out;
-
-   if (asprintf(&out, "wl%d", id) < 0)
-      return NULL;
-
-   return out;
-}
-
 /* Given a time base and a refresh period, find the next
  * time past 'from' that is an even multiple of the period
  * past the base.
@@ -2375,10 +2364,10 @@ struct wsi_wl_present_id {
    struct wl_callback *frame;
    uint64_t present_id;
    uint64_t flow_id;
+   struct loader_wayland_buffer *buffer;
    uint64_t submission_time;
    const VkAllocationCallbacks *alloc;
    struct wsi_wl_swapchain *chain;
-   int buffer_id;
    uint64_t target_time;
    uint64_t correction;
    struct wl_list link;
@@ -2748,29 +2737,24 @@ trace_present(const struct wsi_wl_present_id *id,
 {
    struct wsi_wl_swapchain *chain = id->chain;
    struct wsi_wl_surface *surface = chain->wsi_wl_surface;
-   char *buffer_name;
 
    MESA_TRACE_SET_COUNTER(surface->analytics.latency_str,
                           (presentation_time - id->submission_time) / 1000000.0);
 
    /* Close the previous image display interval first, if there is one. */
    if (surface->analytics.presenting && util_perfetto_is_tracing_enabled()) {
-      buffer_name = stringify_wayland_id(surface->analytics.presenting);
-      MESA_TRACE_TIMESTAMP_END(buffer_name ? buffer_name : "Wayland buffer",
+      MESA_TRACE_TIMESTAMP_END(id->buffer->name,
                                surface->analytics.presentation_track_id,
                                chain->wsi_wl_surface->display->presentation_clock_id, presentation_time);
-      free(buffer_name);
    }
 
-   surface->analytics.presenting = id->buffer_id;
+   surface->analytics.presenting = id->buffer->id;
 
    if (util_perfetto_is_tracing_enabled()) {
-      buffer_name = stringify_wayland_id(id->buffer_id);
-      MESA_TRACE_TIMESTAMP_BEGIN(buffer_name ? buffer_name : "Wayland buffer",
+      MESA_TRACE_TIMESTAMP_BEGIN(id->buffer->name,
                                  surface->analytics.presentation_track_id,
                                  id->flow_id,
                                  chain->wsi_wl_surface->display->presentation_clock_id, presentation_time);
-      free(buffer_name);
    }
 }
 
@@ -3045,8 +3029,11 @@ wsi_wl_swapchain_queue_present(struct wsi_swapchain *wsi_chain,
       id->chain = chain;
       id->present_id = present_id;
       id->alloc = chain->wsi_wl_surface->display->wsi_wl->alloc;
-      id->flow_id = flow_id;
-      id->buffer_id = chain->images[image_index].wayland_buffer.id;
+      id->buffer = &chain->images[image_index].wayland_buffer;
+      /* The buffer can be reused for another flow before the feedback event
+       * arrives, so we need a copy.
+       */
+      id->flow_id = id->buffer->flow_id;
 
       id->submission_time = os_time_get_nano();