OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl/x11: Update to createImageFromNames

Browse Source 
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 <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30245>
This commit is contained in:
Daniel Stone
2024-06-05 18:30:54 +01:00
committed by Marge Bot
parent efb88deb36
commit ecd0fd8deb
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/egl/drivers/dri2/platform_x11.c
View File

@@ -1279,7 +1279,7 @@ dri2_create_image_khr_pixmap(_EGLDisplay *disp, _EGLContext *ctx,
xcb_get_geometry_cookie_t geometry_cookie; xcb_get_geometry_cookie_t geometry_cookie;
xcb_get_geometry_reply_t *geometry_reply; xcb_get_geometry_reply_t *geometry_reply;
xcb_generic_error_t *error; xcb_generic_error_t *error;
int stride, format; int format, fourcc;
(void)ctx; (void)ctx;
@@ -1318,6 +1318,7 @@ dri2_create_image_khr_pixmap(_EGLDisplay *disp, _EGLContext *ctx,
free(geometry_reply); free(geometry_reply);
return NULL; return NULL;
} }
fourcc = loader_image_format_to_fourcc(format);
dri2_img = malloc(sizeof *dri2_img); dri2_img = malloc(sizeof *dri2_img);
if (!dri2_img) { if (!dri2_img) {
@@ -1329,10 +1330,10 @@ dri2_create_image_khr_pixmap(_EGLDisplay *disp, _EGLContext *ctx,
_eglInitImage(&dri2_img->base, disp); _eglInitImage(&dri2_img->base, disp);
stride = buffers[0].pitch / buffers[0].cpp; dri2_img->dri_image = dri2_dpy->image->createImageFromNames(
dri2_img->dri_image = dri2_dpy->image->createImageFromName(
dri2_dpy->dri_screen_render_gpu, buffers_reply->width, 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(buffers_reply);
free(geometry_reply); free(geometry_reply);