fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-25 11:50:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'xwayland-hack-to-fix-regression-with-aplha-blending' into 'master'

Browse source 
glamor: Do not override src alpha only on X11 drawables

Closes #1655

See merge request xorg/xserver!1436
This commit is contained in:
Olivier Fourdan 2025-12-09 02:32:56 +01:00
commit 56f0c586e1
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
glamor/glamor_render.c
View file

@ -1256,6 +1256,7 @@ glamor_composite_with_shader(CARD8 op,
if (ca_state != CA_TWO_PASS && if (ca_state != CA_TWO_PASS &&
key.dest_swizzle == SHADER_DEST_SWIZZLE_DEFAULT && key.dest_swizzle == SHADER_DEST_SWIZZLE_DEFAULT &&
dest_pixmap->drawable.depth == 32 && dest_pixmap->drawable.depth == 32 &&
dest_pixmap->drawable.id != 0 &&
glamor_drawable_effective_depth(dest->pDrawable) == 24) { glamor_drawable_effective_depth(dest->pDrawable) == 24) {
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE);
restore_colormask = TRUE; restore_colormask = TRUE;