fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-11 20:38:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

kopper: reuse loader_dri3_get_pixmap_buffer

Browse source 
delete more code

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619>
This commit is contained in:
Mike Blumenkrantz 2024-07-31 11:08:33 -04:00 • committed by Marge Bot
parent 00f810c31b
commit b5fa2d6448
1 changed files with 3 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/gallium/frontends/dri/kopper.c
View file

@ -166,54 +166,10 @@ kopper_get_pixmap_buffer(struct dri_drawable *drawable,
*/
struct dri_screen *screen = drawable->screen;
#ifdef HAVE_DRI3_MODIFIERS
if (drawable->has_modifiers) {
xcb_dri3_buffers_from_pixmap_cookie_t bps_cookie;
xcb_dri3_buffers_from_pixmap_reply_t *bps_reply;
xcb_generic_error_t *error;
bps_cookie = xcb_dri3_buffers_from_pixmap(conn, pixmap);
bps_reply = xcb_dri3_buffers_from_pixmap_reply(conn, bps_cookie, &error);
if (!bps_reply) {
mesa_loge("kopper: could not create texture from pixmap (%u)", error->error_code);
return NULL;
}
drawable->image =
loader_dri3_create_image_from_buffers(conn, bps_reply, fourcc,
opaque_dri_screen(screen),
drawable);
if (!drawable->image)
return NULL;
width = bps_reply->width;
height = bps_reply->height;
free(bps_reply);
} else
#endif
{
#ifdef HAVE_DRI3
xcb_dri3_buffer_from_pixmap_cookie_t bp_cookie;
xcb_dri3_buffer_from_pixmap_reply_t *bp_reply;
xcb_generic_error_t *error;
bp_cookie = xcb_dri3_buffer_from_pixmap(conn, pixmap);
bp_reply = xcb_dri3_buffer_from_pixmap_reply(conn, bp_cookie, &error);
if (!bp_reply) {
mesa_loge("kopper: could not create texture from pixmap (%u)", error->error_code);
return NULL;
}
drawable->image = loader_dri3_create_image(conn, bp_reply, fourcc,
opaque_dri_screen(screen),
drawable);
if (!drawable->image)
return NULL;
width = bp_reply->width;
height = bp_reply->height;
free(bp_reply);
#else
drawable->image = loader_dri3_get_pixmap_buffer(conn, pixmap, opaque_dri_screen(screen),
fourcc, drawable->has_modifiers, &width, &height, drawable);
if (!drawable->image)
return NULL;
#endif
}
drawable->w = width;
drawable->h = height;