sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

tests/wayland-test-clients: Keep track of advertised modifiers

Browse source 
We will need to check against them for figuring out if we can import a
specific dma-buf.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3350>
This commit is contained in:
Sebastian Wick 2023-12-12 16:39:32 +01:00 • committed by Marge Bot
parent 24ef34f680
commit 63f84fedd9
2 changed files with 70 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/tests/wayland-test-clients/wayland-test-client-utils.c
View file

@ -167,6 +167,53 @@ static const struct test_driver_listener test_driver_listener = {
test_driver_handle_property,
};
static void
dmabuf_modifiers (void *user_data,
struct zwp_linux_dmabuf_v1 *zwp_linux_dmabuf,
uint32_t format,
uint32_t modifier_hi,
uint32_t modifier_lo)
{
WaylandDisplay *display = WAYLAND_DISPLAY (user_data);
DmaBufFormat *dma_format;
uint64_t modifier;
dma_format = g_hash_table_lookup (display->formats,
GUINT_TO_POINTER (format));
if (!dma_format)
{
dma_format = g_new0 (DmaBufFormat, 1);
dma_format->format = format;
g_hash_table_insert (display->formats,
GUINT_TO_POINTER (format),
dma_format);
}
modifier = ((uint64_t)modifier_hi << 32) | modifier_lo;
if (modifier != DRM_FORMAT_MOD_INVALID)
{
dma_format->n_modifiers++;
dma_format->modifiers = g_realloc_n (dma_format->modifiers,
dma_format->n_modifiers,
sizeof (uint64_t));
dma_format->modifiers[dma_format->n_modifiers - 1] = modifier;
}
}
static void
dmabuf_format (void *user_data,
struct zwp_linux_dmabuf_v1 *zwp_linux_dmabuf,
uint32_t format)
{
}
static const struct zwp_linux_dmabuf_v1_listener dmabuf_listener = {
dmabuf_format,
dmabuf_modifiers
};
static void
handle_registry_global (void *user_data,
struct wl_registry *registry,
@ -192,6 +239,14 @@ handle_registry_global (void *user_data,
display->shm = wl_registry_bind (registry,
id, &wl_shm_interface, 1);
}
else if (strcmp (interface, zwp_linux_dmabuf_v1_interface.name) == 0)
{
display->linux_dmabuf =
wl_registry_bind (registry,
id, &zwp_linux_dmabuf_v1_interface, 3);
zwp_linux_dmabuf_v1_add_listener (display->linux_dmabuf,
&dmabuf_listener, display);
}
else if (strcmp (interface, wp_fractional_scale_manager_v1_interface.name) == 0)
{
display->fractional_scale_mgr =
@ -263,6 +318,8 @@ wayland_display_new_full (WaylandDisplayCapabilities capabilities,
display->capabilities = capabilities;
display->properties = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, g_free);
display->formats = g_hash_table_new_full (NULL, NULL, NULL, g_free);
display->display = wayland_display;
display->registry = wl_display_get_registry (display->display);
@ -300,6 +357,7 @@ wayland_display_finalize (GObject *object)
wl_display_disconnect (display->display);
g_clear_pointer (&display->properties, g_hash_table_unref);
g_clear_pointer (&display->formats, g_hash_table_unref);
G_OBJECT_CLASS (wayland_display_parent_class)->finalize (object);
}

12
src/tests/wayland-test-clients/wayland-test-client-utils.h
View file

@ -7,6 +7,7 @@
#include <wayland-client.h>
#include "fractional-scale-v1-client-protocol.h"
#include "linux-dmabuf-unstable-v1-client-protocol.h"
#include "single-pixel-buffer-v1-client-protocol.h"
#include "test-driver-client-protocol.h"
#include "viewporter-client-protocol.h"
@ -19,6 +20,13 @@ typedef enum _WaylandDisplayCapabilities
WAYLAND_DISPLAY_CAPABILITY_XDG_SHELL_V4 = 1 << 1,
} WaylandDisplayCapabilities;
typedef struct _DmaBufFormat
{
uint32_t format;
uint64_t *modifiers;
int n_modifiers;
} DmaBufFormat;
typedef struct _WaylandDisplay
{
GObject parent;
@ -30,6 +38,7 @@ typedef struct _WaylandDisplay
struct wl_compositor *compositor;
struct wl_subcompositor *subcompositor;
struct wl_shm *shm;
struct zwp_linux_dmabuf_v1 *linux_dmabuf;
struct wp_fractional_scale_manager_v1 *fractional_scale_mgr;
struct wp_single_pixel_buffer_manager_v1 *single_pixel_mgr;
struct wp_viewporter *viewporter;
@ -41,6 +50,9 @@ typedef struct _WaylandDisplay
GHashTable *properties;
struct gbm_device *gbm_device;
/* format to DmaBufFormat mapping */
GHashTable *formats;
} WaylandDisplay;
#define WAYLAND_TYPE_DISPLAY (wayland_display_get_type ())