hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-11-01 03:03:58 +00:00
Code Issues Projects Releases Wiki Activity

Remove readmask from screen block/wakeup handler

Browse source 
With no users of the interface needing the readmask anymore, we can
remove it from the argument passed to these functions.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Keith Packard 2015-09-01 11:20:04 -07:00 • committed by Adam Jackson
commit fb0802113b
22 changed files with 77 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

10
exa/exa.c
View file

@ -702,8 +702,7 @@ exaCreateScreenResources(ScreenPtr pScreen)
}
static void
ExaBlockHandler(ScreenPtr pScreen, void *pTimeout,
void *pReadmask)
ExaBlockHandler(ScreenPtr pScreen, void *pTimeout)
{
ExaScreenPriv(pScreen);
@ -712,7 +711,7 @@ ExaBlockHandler(ScreenPtr pScreen, void *pTimeout,
exaMoveInPixmap_mixed(pExaScr->deferred_mixed_pixmap);
unwrap(pExaScr, pScreen, BlockHandler);
(*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
(*pScreen->BlockHandler) (pScreen, pTimeout);
wrap(pExaScr, pScreen, BlockHandler, ExaBlockHandler);
/* The rest only applies to classic EXA */
@ -732,13 +731,12 @@ ExaBlockHandler(ScreenPtr pScreen, void *pTimeout,
}
static void
ExaWakeupHandler(ScreenPtr pScreen, unsigned long result,
void *pReadmask)
ExaWakeupHandler(ScreenPtr pScreen, int result)
{
ExaScreenPriv(pScreen);
unwrap(pExaScr, pScreen, WakeupHandler);
(*pScreen->WakeupHandler) (pScreen, result, pReadmask);
(*pScreen->WakeupHandler) (pScreen, result);
wrap(pExaScr, pScreen, WakeupHandler, ExaWakeupHandler);
if (result == 0 && pExaScr->numOffscreenAvailable > 1) {