From ecd0fd8deb5fdc12becaa4cdea12a669cf1420c5 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Wed, 5 Jun 2024 18:30:54 +0100 Subject: [PATCH] egl/x11: Update to createImageFromNames This is the last user of the old createImageFromName entrypoint; use createImageFromNames instead, which involves converting to using FourCC and also a byte rather than pixel stride. Signed-off-by: Daniel Stone Part-of: --- src/egl/drivers/dri2/platform_x11.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index 9cd00774785..3cfa6a01fb0 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -1279,7 +1279,7 @@ dri2_create_image_khr_pixmap(_EGLDisplay *disp, _EGLContext *ctx, xcb_get_geometry_cookie_t geometry_cookie; xcb_get_geometry_reply_t *geometry_reply; xcb_generic_error_t *error; - int stride, format; + int format, fourcc; (void)ctx; @@ -1318,6 +1318,7 @@ dri2_create_image_khr_pixmap(_EGLDisplay *disp, _EGLContext *ctx, free(geometry_reply); return NULL; } + fourcc = loader_image_format_to_fourcc(format); dri2_img = malloc(sizeof *dri2_img); if (!dri2_img) { @@ -1329,10 +1330,10 @@ dri2_create_image_khr_pixmap(_EGLDisplay *disp, _EGLContext *ctx, _eglInitImage(&dri2_img->base, disp); - stride = buffers[0].pitch / buffers[0].cpp; - dri2_img->dri_image = dri2_dpy->image->createImageFromName( + dri2_img->dri_image = dri2_dpy->image->createImageFromNames( dri2_dpy->dri_screen_render_gpu, buffers_reply->width, - buffers_reply->height, format, buffers[0].name, stride, dri2_img); + buffers_reply->height, fourcc, (int *) &buffers[0].name, 1, + (int *) &buffers[0].pitch, 0, dri2_img); free(buffers_reply); free(geometry_reply);