diff options
author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2024-11-05 08:13:07 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2024-11-05 08:13:07 +0000 |
commit | 3ced31dfa7da11653ae880c2776cbf2e2256a009 (patch) | |
tree | 981ca5d9ba5a6d1f1cf8b8685faf120dd8c5c96c /xserver/glamor/glamor_text.c | |
parent | 939fde46a015afeec2b96b5cb6d0cc8aefe54c3d (diff) |
Update to xserver 21.1.14. tested by tb@
The xkb security fix was committed earlier. This is the rest of the
21.1.14 update.
Diffstat (limited to 'xserver/glamor/glamor_text.c')
-rw-r--r-- | xserver/glamor/glamor_text.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/xserver/glamor/glamor_text.c b/xserver/glamor/glamor_text.c index cf165cad8..e92f55b3c 100644 --- a/xserver/glamor/glamor_text.c +++ b/xserver/glamor/glamor_text.c @@ -235,7 +235,11 @@ static const char fs_vars_text[] = static const char fs_exec_text[] = " ivec2 itile_texture = ivec2(glyph_pos);\n" +#if BITMAP_BIT_ORDER == MSBFirst + " uint x = uint(7) - uint(itile_texture.x & 7);\n" +#else " uint x = uint(itile_texture.x & 7);\n" +#endif " itile_texture.x >>= 3;\n" " uint texel = texelFetch(font, itile_texture, 0).x;\n" " uint bit = (texel >> x) & uint(1);\n" @@ -244,7 +248,11 @@ static const char fs_exec_text[] = static const char fs_exec_te[] = " ivec2 itile_texture = ivec2(glyph_pos);\n" +#if BITMAP_BIT_ORDER == MSBFirst + " uint x = uint(7) - uint(itile_texture.x & 7);\n" +#else " uint x = uint(itile_texture.x & 7);\n" +#endif " itile_texture.x >>= 3;\n" " uint texel = texelFetch(font, itile_texture, 0).x;\n" " uint bit = (texel >> x) & uint(1);\n" |