wok-current diff 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 |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/xorg-xf86-video-intel/stuff/patch-src_sna_sna__accel.c Sun Jan 14 08:12:37 2024 +0000 1.3 @@ -0,0 +1,48 @@ 1.4 +$NetBSD$ 1.5 + 1.6 +--- a/src/sna/sna_accel.c 2014-12-20 13:29:27.000000000 +0000 1.7 ++++ b/src/sna/sna_accel.c 1.8 +@@ -115,6 +115,11 @@ 1.9 + #define RECTILINEAR 0x4 1.10 + #define OVERWRITES 0x8 1.11 + 1.12 ++#if XFONT2_CLIENT_FUNCS_VERSION >= 1 1.13 ++#define AllocateFontPrivateIndex() xfont2_allocate_font_private_index() 1.14 ++#define FontSetPrivate(font, idx, data) xfont2_font_set_private(font, idx, data) 1.15 ++#endif 1.16 ++ 1.17 + #if 0 1.18 + static void __sna_fallback_flush(DrawablePtr d) 1.19 + { 1.20 +@@ -17811,6 +17816,13 @@ static bool sna_option_accel_blt(struct 1.21 + return strcasecmp(s, "blt") == 0; 1.22 + } 1.23 + 1.24 ++#if HAVE_NOTIFY_FD 1.25 ++static void sna_accel_notify(int fd, int ready, void *data) 1.26 ++{ 1.27 ++ sna_mode_wakeup(data); 1.28 ++} 1.29 ++#endif 1.30 ++ 1.31 + bool sna_accel_init(ScreenPtr screen, struct sna *sna) 1.32 + { 1.33 + const char *backend; 1.34 +@@ -17822,7 +17834,7 @@ bool sna_accel_init(ScreenPtr screen, st 1.35 + list_init(&sna->flush_pixmaps); 1.36 + list_init(&sna->active_pixmaps); 1.37 + 1.38 +- AddGeneralSocket(sna->kgem.fd); 1.39 ++ SetNotifyFd(sna->kgem.fd, sna_accel_notify, X_NOTIFY_READ, sna); 1.40 + 1.41 + #ifdef DEBUG_MEMORY 1.42 + sna->timer_expire[DEBUG_MEMORY_TIMER] = GetTimeInMillis()+ 10 * 1000; 1.43 +@@ -17998,7 +18010,7 @@ void sna_accel_close(struct sna *sna) 1.44 + sna_pixmap_expire(sna); 1.45 + 1.46 + DeleteCallback(&FlushCallback, sna_accel_flush_callback, sna); 1.47 +- RemoveGeneralSocket(sna->kgem.fd); 1.48 ++ RemoveNotifyFd(sna->kgem.fd); 1.49 + 1.50 + kgem_cleanup_cache(&sna->kgem); 1.51 + }