NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

egl/wayland: Fix EGL_EXT_present_opaque

Browse source 
This extension has been broken ever since the initial commit. It created
an XRGB DRIImage for the driver to render to, so whilst the presentation
was opaque, the buffer also completely lacked an alpha channel.

Fix it by making sure we only modify the FourCC we send to the Wayland
server when creating a buffer.

Closes: mesa/mesa#5886
Fixes: 9aee7855d2 ("egl: implement EGL_EXT_present_opaque on wayland")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27709>
(cherry picked from commit 9ea9a963aa142910ed3a0fcea9060d3a92ee5ab7)
This commit is contained in:
Daniel Stone 2024-02-23 11:45:15 +00:00 • committed by Eric Engestrom
parent b137afc1e6
commit 7e6f55f336
2 changed files with 15 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -474,7 +474,7 @@
"description": "egl/wayland: Fix EGL_EXT_present_opaque",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "9aee7855d2ddf47169270d5d1e3e92ff6e5f65c2",
"notes": null

61
src/egl/drivers/dri2/platform_wayland.c
View file

@ -246,7 +246,7 @@ static const struct dri2_wl_visual {
static int
dri2_wl_visual_idx_from_config(struct dri2_egl_display *dri2_dpy,
const __DRIconfig *config, bool force_opaque)
const __DRIconfig *config)
{
int shifts[4];
unsigned int sizes[4];
@ -256,16 +256,13 @@ dri2_wl_visual_idx_from_config(struct dri2_egl_display *dri2_dpy,
for (unsigned int i = 0; i < ARRAY_SIZE(dri2_wl_visuals); i++) {
const struct dri2_wl_visual *wl_visual = &dri2_wl_visuals[i];
int cmp_rgb_shifts =
memcmp(shifts, wl_visual->rgba_shifts, 3 * sizeof(shifts[0]));
int cmp_rgb_sizes =
memcmp(sizes, wl_visual->rgba_sizes, 3 * sizeof(sizes[0]));
int cmp_rgba_shifts =
memcmp(shifts, wl_visual->rgba_shifts, 4 * sizeof(shifts[0]));
int cmp_rgba_sizes =
memcmp(sizes, wl_visual->rgba_sizes, 4 * sizeof(sizes[0]));
if (cmp_rgb_shifts == 0 && cmp_rgb_sizes == 0 &&
wl_visual->rgba_shifts[3] == (force_opaque ? -1 : shifts[3]) &&
wl_visual->rgba_sizes[3] == (force_opaque ? 0 : sizes[3])) {
if (cmp_rgba_shifts == 0 && cmp_rgba_sizes == 0)
return i;
}
}
return -1;
@ -318,7 +315,7 @@ dri2_wl_is_format_supported(void *user_data, uint32_t format)
for (int i = 0; dri2_dpy->driver_configs[i]; i++)
if (j == dri2_wl_visual_idx_from_config(
dri2_dpy, dri2_dpy->driver_configs[i], false))
dri2_dpy, dri2_dpy->driver_configs[i]))
return true;
return false;
@ -726,43 +723,10 @@ dri2_wl_create_window_surface(_EGLDisplay *disp, _EGLConfig *conf,
dri2_surf->base.Width = window->width;
dri2_surf->base.Height = window->height;
#ifndef NDEBUG
/* Enforce that every visual has an opaque variant (requirement to support
* EGL_EXT_present_opaque)
*/
for (unsigned int i = 0; i < ARRAY_SIZE(dri2_wl_visuals); i++) {
const struct dri2_wl_visual *transparent_visual = &dri2_wl_visuals[i];
if (transparent_visual->rgba_sizes[3] == 0) {
continue;
}
bool found_opaque_equivalent = false;
for (unsigned int j = 0; j < ARRAY_SIZE(dri2_wl_visuals); j++) {
const struct dri2_wl_visual *opaque_visual = &dri2_wl_visuals[j];
if (opaque_visual->rgba_sizes[3] != 0) {
continue;
}
int cmp_rgb_shifts =
memcmp(transparent_visual->rgba_shifts, opaque_visual->rgba_shifts,
3 * sizeof(opaque_visual->rgba_shifts[0]));
int cmp_rgb_sizes =
memcmp(transparent_visual->rgba_sizes, opaque_visual->rgba_sizes,
3 * sizeof(opaque_visual->rgba_sizes[0]));
if (cmp_rgb_shifts == 0 && cmp_rgb_sizes == 0) {
found_opaque_equivalent = true;
break;
}
}
assert(found_opaque_equivalent);
}
#endif
visual_idx = dri2_wl_visual_idx_from_config(dri2_dpy, config,
dri2_surf->base.PresentOpaque);
visual_idx = dri2_wl_visual_idx_from_config(dri2_dpy, config);
assert(visual_idx != -1);
assert(dri2_wl_visuals[visual_idx].dri_image_format !=
__DRI_IMAGE_FORMAT_NONE);
if (dri2_dpy->wl_dmabuf || dri2_dpy->wl_drm) {
dri2_surf->format = dri2_wl_visuals[visual_idx].wl_drm_format;
@ -1517,6 +1481,9 @@ create_wl_buffer(struct dri2_egl_display *dri2_dpy,
close(fd);
}
if (dri2_surf && dri2_surf->base.PresentOpaque)
fourcc = dri2_wl_visuals[visual_idx].opaque_wl_drm_format;
ret = zwp_linux_buffer_params_v1_create_immed(params, width, height,
fourcc, 0);
zwp_linux_buffer_params_v1_destroy(params);
@ -2100,7 +2067,7 @@ dri2_wl_add_configs_for_visuals(_EGLDisplay *disp)
/* No match for config. Try if we can blitImage convert to a visual */
c = dri2_wl_visual_idx_from_config(dri2_dpy,
dri2_dpy->driver_configs[i], false);
dri2_dpy->driver_configs[i]);
if (c == -1)
continue;