wok-current annotate xorg-xf86-video-intel/stuff/patch-src_sna_sna__accel.c @ rev 25634

Mass update, new toolchain gcc 8.3.0, glibc 2.28.0
author Stanislas Leduc <shann@slitaz.org>
date Sun Jan 14 08:12:37 2024 +0000 (20 months ago)
parents
children
rev   line source
shann@25634 1 $NetBSD$
shann@25634 2
shann@25634 3 --- a/src/sna/sna_accel.c 2014-12-20 13:29:27.000000000 +0000
shann@25634 4 +++ b/src/sna/sna_accel.c
shann@25634 5 @@ -115,6 +115,11 @@
shann@25634 6 #define RECTILINEAR 0x4
shann@25634 7 #define OVERWRITES 0x8
shann@25634 8
shann@25634 9 +#if XFONT2_CLIENT_FUNCS_VERSION >= 1
shann@25634 10 +#define AllocateFontPrivateIndex() xfont2_allocate_font_private_index()
shann@25634 11 +#define FontSetPrivate(font, idx, data) xfont2_font_set_private(font, idx, data)
shann@25634 12 +#endif
shann@25634 13 +
shann@25634 14 #if 0
shann@25634 15 static void __sna_fallback_flush(DrawablePtr d)
shann@25634 16 {
shann@25634 17 @@ -17811,6 +17816,13 @@ static bool sna_option_accel_blt(struct
shann@25634 18 return strcasecmp(s, "blt") == 0;
shann@25634 19 }
shann@25634 20
shann@25634 21 +#if HAVE_NOTIFY_FD
shann@25634 22 +static void sna_accel_notify(int fd, int ready, void *data)
shann@25634 23 +{
shann@25634 24 + sna_mode_wakeup(data);
shann@25634 25 +}
shann@25634 26 +#endif
shann@25634 27 +
shann@25634 28 bool sna_accel_init(ScreenPtr screen, struct sna *sna)
shann@25634 29 {
shann@25634 30 const char *backend;
shann@25634 31 @@ -17822,7 +17834,7 @@ bool sna_accel_init(ScreenPtr screen, st
shann@25634 32 list_init(&sna->flush_pixmaps);
shann@25634 33 list_init(&sna->active_pixmaps);
shann@25634 34
shann@25634 35 - AddGeneralSocket(sna->kgem.fd);
shann@25634 36 + SetNotifyFd(sna->kgem.fd, sna_accel_notify, X_NOTIFY_READ, sna);
shann@25634 37
shann@25634 38 #ifdef DEBUG_MEMORY
shann@25634 39 sna->timer_expire[DEBUG_MEMORY_TIMER] = GetTimeInMillis()+ 10 * 1000;
shann@25634 40 @@ -17998,7 +18010,7 @@ void sna_accel_close(struct sna *sna)
shann@25634 41 sna_pixmap_expire(sna);
shann@25634 42
shann@25634 43 DeleteCallback(&FlushCallback, sna_accel_flush_callback, sna);
shann@25634 44 - RemoveGeneralSocket(sna->kgem.fd);
shann@25634 45 + RemoveNotifyFd(sna->kgem.fd);
shann@25634 46
shann@25634 47 kgem_cleanup_cache(&sna->kgem);
shann@25634 48 }