hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-29 02:31:18 +00:00
Code Issues Projects Releases Wiki Activity

glamor/glamor_composite_glyphs.c Fix glyph compositing paths

Browse source 
In 3d27175b3c
I inverted a `glamor_pixmap_is_memory` condition.
I assumed that if the source pixmap for a glyph is memory, the fast path
will fail, and we have to take the fallback patch.

This was not the case.

This reverts that commit and just checks if the destination is memory,
which it probably will be with `GLAMOR_NO_RENDER_ACCEL`

This doesn't re-introduced the trashed glyph rendering.

Fixes: 3d27175b3c
Fixes: https://github.com/X11Libre/xserver/issues/3699

Signed-off-by: stefan11111 <stefan11111github@gmail.com>
This commit is contained in:
stefan11111 2026-09-18 19:54:28 +03:00 • committed by Enrico Weigelt
commit 4ba6334129
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
glamor/glamor_composite_glyphs.c
View file

@ -427,7 +427,8 @@ glamor_composite_glyphs(CARD8 op,
*/
if (_X_UNLIKELY(glyph_draw->width > glyph_max_dim ||
glyph_draw->height > glyph_max_dim ||
glamor_pixmap_is_memory((PixmapPtr)glyph_draw)))
!glamor_pixmap_is_memory((PixmapPtr)glyph_draw) ||
glamor_pixmap_is_memory((PixmapPtr)drawable)))
{
if (glyphs_queued) {
glamor_glyphs_flush(op, src, dst, prog, glyph_atlas, glyphs_queued);