mirror of
https://github.com/X11Libre/xf86-video-ati.git
synced 2026-03-24 01:24:43 +00:00
replace BLOCKHANDLER_ARGS_DECL and BLOCKHANDLER_ARGS
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
@@ -26,7 +26,4 @@
|
|||||||
#ifndef COMPAT_API_H
|
#ifndef COMPAT_API_H
|
||||||
#define COMPAT_API_H
|
#define COMPAT_API_H
|
||||||
|
|
||||||
#define BLOCKHANDLER_ARGS_DECL ScreenPtr pScreen, pointer pTimeout
|
|
||||||
#define BLOCKHANDLER_ARGS pScreen, pTimeout
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -487,7 +487,7 @@ typedef struct {
|
|||||||
|
|
||||||
Bool (*CloseScreen)(ScreenPtr pScreen);
|
Bool (*CloseScreen)(ScreenPtr pScreen);
|
||||||
|
|
||||||
void (*BlockHandler)(BLOCKHANDLER_ARGS_DECL);
|
void (*BlockHandler)(ScreenPtr pScreen, pointer pTimeout);
|
||||||
|
|
||||||
void (*CreateFence) (ScreenPtr pScreen, struct _SyncFence *pFence,
|
void (*CreateFence) (ScreenPtr pScreen, struct _SyncFence *pFence,
|
||||||
Bool initially_triggered);
|
Bool initially_triggered);
|
||||||
|
|||||||
@@ -1201,7 +1201,7 @@ radeon_scanout_flip(ScreenPtr pScreen, RADEONInfoPtr info,
|
|||||||
drmmode_fb_reference(pRADEONEnt->fd, &drmmode_crtc->flip_pending, fb);
|
drmmode_fb_reference(pRADEONEnt->fd, &drmmode_crtc->flip_pending, fb);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void RADEONBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL)
|
static void RADEONBlockHandler_KMS(ScreenPtr pScreen, pointer pTimeout)
|
||||||
{
|
{
|
||||||
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
|
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
|
||||||
RADEONInfoPtr info = RADEONPTR(pScrn);
|
RADEONInfoPtr info = RADEONPTR(pScrn);
|
||||||
@@ -1209,7 +1209,7 @@ static void RADEONBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL)
|
|||||||
int c;
|
int c;
|
||||||
|
|
||||||
pScreen->BlockHandler = info->BlockHandler;
|
pScreen->BlockHandler = info->BlockHandler;
|
||||||
(*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
|
pScreen->BlockHandler(pScreen, pTimeout);
|
||||||
pScreen->BlockHandler = RADEONBlockHandler_KMS;
|
pScreen->BlockHandler = RADEONBlockHandler_KMS;
|
||||||
|
|
||||||
if (!xf86ScreenToScrn(radeon_primary_screen(pScreen))->vtSema)
|
if (!xf86ScreenToScrn(radeon_primary_screen(pScreen))->vtSema)
|
||||||
|
|||||||
Reference in New Issue
Block a user