fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-05 14:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: client-helper: Add dmabuf protocol support

Browse source 
Allow querying supported formats and modifiers.
We use version 3 as it is easier to implement and also works
if no main device is present - such as when using llvmpipe.

Signed-off-by: Robert Mader <robert.mader@collabora.com>
This commit is contained in:
Robert Mader 2025-03-24 17:32:54 +01:00
parent cd35c6c780
commit 33db73f134
3 changed files with 62 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/meson.build
View file

@ -30,6 +30,8 @@ lib_test_client = static_library(
[
'weston-test-client-helper.c',
'weston-test-fixture-compositor.c',
linux_dmabuf_unstable_v1_client_protocol_h,
linux_dmabuf_unstable_v1_protocol_c,
weston_test_client_protocol_h,
weston_test_protocol_c,
weston_output_capture_client_protocol_h,

54
tests/weston-test-client-helper.c
View file

@ -53,6 +53,11 @@
#define min(a, b) (((a) > (b)) ? (b) : (a))
#define clip(x, a, b) min(max(x, a), b)
struct drm_format {
uint32_t format;
uint64_t modifier;
};
int
surface_contains(struct surface *surface, int x, int y)
{
@ -601,6 +606,45 @@ struct wl_shm_listener shm_listener = {
shm_format
};
bool
support_drm_format(struct client *client, uint32_t format, uint64_t modifier)
{
struct drm_format *p;
wl_array_for_each(p, &client->drm_formats)
if (p->format == format && p->modifier == modifier)
return true;
return false;
}
static void
dmabuf_modifier(void *data, struct zwp_linux_dmabuf_v1 *zwp_linux_dmabuf,
uint32_t format, uint32_t modifier_hi, uint32_t modifier_lo)
{
struct client *client = data;
uint64_t modifier = u64_from_u32s(modifier_hi, modifier_lo);
struct drm_format *p;
p = wl_array_add(&client->drm_formats, sizeof *p);
assert(p);
p->format = format;
p->modifier = modifier;
}
static void
dmabuf_format(void *data, struct zwp_linux_dmabuf_v1 *zwp_linux_dmabuf,
uint32_t format)
{
/* deprecated */
}
static const struct zwp_linux_dmabuf_v1_listener dmabuf_listener = {
dmabuf_format,
dmabuf_modifier
};
static void
test_handle_pointer_position(void *data, struct weston_test *weston_test,
wl_fixed_t x, wl_fixed_t y)
@ -858,6 +902,12 @@ handle_global(void *data, struct wl_registry *registry,
wl_registry_bind(registry, id,
&wl_shm_interface, version);
wl_shm_add_listener(client->wl_shm, &shm_listener, client);
} else if (strcmp(interface, zwp_linux_dmabuf_v1_interface.name) == 0) {
client->dmabuf =
wl_registry_bind(registry, id,
&zwp_linux_dmabuf_v1_interface, 3);
zwp_linux_dmabuf_v1_add_listener(client->dmabuf,
&dmabuf_listener, client);
} else if (strcmp(interface, "wl_output") == 0) {
output = xzalloc(sizeof *output);
output->wl_output =
@ -1038,6 +1088,7 @@ create_client(void)
client->wl_display = wl_display_connect(NULL);
test_assert_ptr_not_null(client->wl_display);
wl_array_init(&client->shm_formats);
wl_array_init(&client->drm_formats);
wl_list_init(&client->global_list);
wl_list_init(&client->inputs);
wl_list_init(&client->output_list);
@ -1156,6 +1207,7 @@ client_destroy(struct client *client)
surface_destroy(client->surface);
wl_array_release(&client->shm_formats);
wl_array_release(&client->drm_formats);
while (!wl_list_empty(&client->inputs)) {
input_destroy(container_of(client->inputs.next,
@ -1179,6 +1231,8 @@ client_destroy(struct client *client)
if (client->wl_shm)
wl_shm_destroy(client->wl_shm);
if (client->dmabuf)
zwp_linux_dmabuf_v1_destroy(client->dmabuf);
if (client->wl_compositor)
wl_compositor_destroy(client->wl_compositor);
if (client->wl_registry)

6
tests/weston-test-client-helper.h
View file

@ -34,6 +34,7 @@
#include <pixman.h>
#include <wayland-client-protocol.h>
#include "linux-dmabuf-unstable-v1-client-protocol.h"
#include "weston-test-runner.h"
#include "weston-test-client-protocol.h"
#include "viewporter-client-protocol.h"
@ -53,6 +54,7 @@ struct client {
struct wl_registry *wl_registry;
struct wl_compositor *wl_compositor;
struct wl_shm *wl_shm;
struct zwp_linux_dmabuf_v1 *dmabuf;
struct test *test;
/* the seat that is actually used for input events */
struct input *input;
@ -65,6 +67,7 @@ struct client {
struct output *output;
struct surface *surface;
struct wl_array shm_formats;
struct wl_array drm_formats;
struct wl_list global_list;
struct wl_list output_list; /* struct output::link */
};
@ -224,6 +227,9 @@ create_shm_buffer(struct client *client, int width, int height,
struct buffer *
create_shm_buffer_a8r8g8b8(struct client *client, int width, int height);
bool
support_drm_format(struct client *client, uint32_t format, uint64_t modifier);
void
buffer_destroy(struct buffer *buf);