fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2025-12-20 04:40:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: client-helper: Add create_buffer() helper

Browse source 
Taking the newly introduced client_buffer_type enum, allowing simple
creation of dmabuf buffers.

Signed-off-by: Robert Mader <robert.mader@collabora.com>
This commit is contained in:
Robert Mader 2025-09-25 17:48:19 +02:00
parent e27929e3b3
commit 23f396aa30
2 changed files with 39 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,7 +39,6 @@
#include "test-config.h"
#include "pixel-formats.h"
#include "shared/client-buffer-util.h"
#include "shared/weston-drm-fourcc.h"
#include "shared/os-compatibility.h"
#include "shared/string-helpers.h"
@ -492,31 +491,44 @@ support_shm_format(struct client *client, uint32_t shm_format)
}
struct buffer *
create_shm_buffer(struct client *client, int width, int height,
uint32_t drm_format)
create_buffer(struct client *client, int width, int height, uint32_t drm_format,
enum client_buffer_type buffer_type)
{
const struct pixel_format_info *pfmt;
struct wl_shm *shm = client->wl_shm;
struct buffer *buf;
uint32_t shm_format;
test_assert_int_gt(width, 0);
test_assert_int_gt(height, 0);
pfmt = pixel_format_get_info(drm_format);
test_assert_ptr_not_null(pfmt);
test_assert_uint_eq(pixel_format_get_plane_count(pfmt), 1);
shm_format = pixel_format_get_shm_format(pfmt);
if (!support_shm_format(client, shm_format))
return NULL;
buf = xzalloc(sizeof *buf);
buf->buf = client_buffer_util_create_shm_buffer(shm,
pfmt,
width,
height);
if (buffer_type == CLIENT_BUFFER_TYPE_SHM) {
uint32_t shm_format;
shm_format = pixel_format_get_shm_format(pfmt);
if (!support_shm_format(client, shm_format))
return NULL;
buf->buf = client_buffer_util_create_shm_buffer(client->wl_shm,
pfmt,
width,
height);
} else {
test_assert_true(buffer_type == CLIENT_BUFFER_TYPE_DMABUF);
if (!support_drm_format(client, drm_format, DRM_FORMAT_MOD_LINEAR))
return NULL;
buf->buf = client_buffer_util_create_dmabuf_buffer(client->wl_display,
client->dmabuf,
pfmt,
width,
height);
}
test_assert_ptr_not_null(buf->buf);
buf->proxy = buf->buf->wl_buffer;
buf->len = buf->buf->bytes;
@ -532,6 +544,14 @@ create_shm_buffer(struct client *client, int width, int height,
return buf;
}
struct buffer *
create_shm_buffer(struct client *client, int width, int height,
uint32_t drm_format)
{
return create_buffer(client, width, height, drm_format,
CLIENT_BUFFER_TYPE_SHM);
}
struct buffer *
create_shm_buffer_a8r8g8b8(struct client *client, int width, int height)
{

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

@ -35,6 +35,7 @@
#include <wayland-client-protocol.h>
#include "linux-dmabuf-unstable-v1-client-protocol.h"
#include "shared/client-buffer-util.h"
#include "weston-test-runner.h"
#include "weston-test-client-protocol.h"
#include "viewporter-client-protocol.h"
@ -221,6 +222,10 @@ create_client_and_test_surface(int x, int y, int width, int height);
bool
support_shm_format(struct client *client, uint32_t shm_format);
struct buffer *
create_buffer(struct client *client, int width, int height, uint32_t drm_format,
enum client_buffer_type buffer_type);
struct buffer *
create_shm_buffer(struct client *client, int width, int height,
uint32_t drm_format);