diff --git a/Xext/sync.c b/Xext/sync.c index fd2ceb042..262f3f3c0 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -70,6 +70,7 @@ PERFORMANCE OF THIS SOFTWARE. #include "syncsdk.h" #include "protocol-versions.h" #include "inputstr.h" +#include "misync_priv.h" #include #if !defined(WIN32) diff --git a/miext/sync/misync.c b/miext/sync/misync.c index 0931803f6..48234ef8a 100644 --- a/miext/sync/misync.c +++ b/miext/sync/misync.c @@ -26,7 +26,7 @@ #endif #include "scrnintstr.h" -#include "misync.h" +#include "misync_priv.h" #include "misyncstr.h" DevPrivateKeyRec miSyncScreenPrivateKey; diff --git a/miext/sync/misync.h b/miext/sync/misync.h index f7082d5ea..4748fa4ae 100644 --- a/miext/sync/misync.h +++ b/miext/sync/misync.h @@ -43,7 +43,6 @@ typedef struct _syncScreenFuncs { SyncScreenDestroyFenceFunc DestroyFence; } SyncScreenFuncsRec, *SyncScreenFuncsPtr; - extern _X_EXPORT void miSyncScreenCreateFence(ScreenPtr pScreen, SyncFence * pFence, Bool initially_triggered); @@ -65,11 +64,12 @@ typedef struct _syncFenceFuncs { } SyncFenceFuncsRec, *SyncFenceFuncsPtr; extern _X_EXPORT void - miSyncInitFence(ScreenPtr pScreen, SyncFence * pFence, Bool initially_triggered); + extern _X_EXPORT void miSyncDestroyFence(SyncFence * pFence); + extern _X_EXPORT void miSyncTriggerFence(SyncFence * pFence); @@ -77,25 +77,4 @@ extern _X_EXPORT SyncScreenFuncsPtr miSyncGetScreenFuncs(ScreenPtr pScreen); extern _X_EXPORT Bool miSyncSetup(ScreenPtr pScreen); -Bool -miSyncFenceCheckTriggered(SyncFence * pFence); - -void -miSyncFenceSetTriggered(SyncFence * pFence); - -void -miSyncFenceReset(SyncFence * pFence); - -void -miSyncFenceAddTrigger(SyncTrigger * pTrigger); - -void -miSyncFenceDeleteTrigger(SyncTrigger * pTrigger); - -int -miSyncInitFenceFromFD(DrawablePtr pDraw, SyncFence *pFence, int fd, BOOL initially_triggered); - -int -miSyncFDFromFence(DrawablePtr pDraw, SyncFence *pFence); - #endif /* _MISYNC_H_ */ diff --git a/miext/sync/misync_priv.h b/miext/sync/misync_priv.h new file mode 100644 index 000000000..76ac40d9a --- /dev/null +++ b/miext/sync/misync_priv.h @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: MIT OR X11 + * + * Copyright © 2024 Enrico Weigelt, metux IT consult + * Copyright © 2010 NVIDIA Corporation + */ +#ifndef _XSERVER_MISYNC_PRIV_H +#define _XSERVER_MISYNC_PRIV_H + +#include "misync.h" + +extern DevPrivateKeyRec miSyncScreenPrivateKey; + +typedef struct _syncScreenPriv { + /* Wrappable sync-specific screen functions */ + SyncScreenFuncsRec funcs; + + /* Wrapped screen functions */ + CloseScreenProcPtr CloseScreen; +} SyncScreenPrivRec, *SyncScreenPrivPtr; + +#define SYNC_SCREEN_PRIV(pScreen) \ + (SyncScreenPrivPtr) dixLookupPrivate(&pScreen->devPrivates, \ + &miSyncScreenPrivateKey) + +Bool miSyncFenceCheckTriggered(SyncFence * pFence); +void miSyncFenceSetTriggered(SyncFence * pFence); +void miSyncFenceReset(SyncFence * pFence); +void miSyncFenceAddTrigger(SyncTrigger * pTrigger); +void miSyncFenceDeleteTrigger(SyncTrigger * pTrigger); +int miSyncInitFenceFromFD(DrawablePtr pDraw, SyncFence *pFence, int fd, BOOL initially_triggered); +int miSyncFDFromFence(DrawablePtr pDraw, SyncFence *pFence); + +#endif /* _XSERVER_MISYNC_PRIV_H */ diff --git a/miext/sync/misyncfd.c b/miext/sync/misyncfd.c index fecbd0fb9..42a75024d 100644 --- a/miext/sync/misyncfd.c +++ b/miext/sync/misyncfd.c @@ -25,7 +25,7 @@ #endif #include "scrnintstr.h" -#include "misync.h" +#include "misync_priv.h" #include "misyncstr.h" #include "misyncfd.h" #include "pixmapstr.h" diff --git a/miext/sync/misyncshm.c b/miext/sync/misyncshm.c index 27bf07db1..e894e5894 100644 --- a/miext/sync/misyncshm.c +++ b/miext/sync/misyncshm.c @@ -25,7 +25,7 @@ #endif #include "scrnintstr.h" -#include "misync.h" +#include "misync_priv.h" #include "misyncstr.h" #include "misyncshm.h" #include "misyncfd.h" diff --git a/miext/sync/misyncstr.h b/miext/sync/misyncstr.h index 490cf6194..21cb0b257 100644 --- a/miext/sync/misyncstr.h +++ b/miext/sync/misyncstr.h @@ -78,18 +78,4 @@ typedef struct _SyncTriggerList { struct _SyncTriggerList *next; } SyncTriggerList; -extern DevPrivateKeyRec miSyncScreenPrivateKey; - -#define SYNC_SCREEN_PRIV(pScreen) \ - (SyncScreenPrivPtr) dixLookupPrivate(&pScreen->devPrivates, \ - &miSyncScreenPrivateKey) - -typedef struct _syncScreenPriv { - /* Wrappable sync-specific screen functions */ - SyncScreenFuncsRec funcs; - - /* Wrapped screen functions */ - CloseScreenProcPtr CloseScreen; -} SyncScreenPrivRec, *SyncScreenPrivPtr; - #endif /* _MISYNCSTR_H_ */