frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

miext: move private definitions out of public headers 

public server module API headers shouldn't be clobbered with non-exported
definitions, so move them out to private header file.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1293>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-12 16:53:25 +01:00 committed by Marge Bot
parent 368055d3f1
commit 0acba54e54
7 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Xext/sync.c
View File

@ -70,6 +70,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include "syncsdk.h" #include "syncsdk.h"
#include "protocol-versions.h" #include "protocol-versions.h"
#include "inputstr.h" #include "inputstr.h"
#include "misync_priv.h"
#include <stdio.h> #include <stdio.h>
#if !defined(WIN32) #if !defined(WIN32)

2
miext/sync/misync.c
View File

@ -26,7 +26,7 @@
#endif #endif
#include "scrnintstr.h" #include "scrnintstr.h"
#include "misync.h" #include "misync_priv.h"
#include "misyncstr.h" #include "misyncstr.h"
DevPrivateKeyRec miSyncScreenPrivateKey; DevPrivateKeyRec miSyncScreenPrivateKey;

25
miext/sync/misync.h
View File

@ -43,7 +43,6 @@ typedef struct _syncScreenFuncs {
SyncScreenDestroyFenceFunc DestroyFence; SyncScreenDestroyFenceFunc DestroyFence;
} SyncScreenFuncsRec, *SyncScreenFuncsPtr; } SyncScreenFuncsRec, *SyncScreenFuncsPtr;
extern _X_EXPORT void extern _X_EXPORT void
miSyncScreenCreateFence(ScreenPtr pScreen, SyncFence * pFence, miSyncScreenCreateFence(ScreenPtr pScreen, SyncFence * pFence,
Bool initially_triggered); Bool initially_triggered);
@ -65,11 +64,12 @@ typedef struct _syncFenceFuncs {
} SyncFenceFuncsRec, *SyncFenceFuncsPtr; } SyncFenceFuncsRec, *SyncFenceFuncsPtr;
extern _X_EXPORT void extern _X_EXPORT void
miSyncInitFence(ScreenPtr pScreen, SyncFence * pFence, miSyncInitFence(ScreenPtr pScreen, SyncFence * pFence,
Bool initially_triggered); Bool initially_triggered);
extern _X_EXPORT void extern _X_EXPORT void
miSyncDestroyFence(SyncFence * pFence); miSyncDestroyFence(SyncFence * pFence);
extern _X_EXPORT void extern _X_EXPORT void
miSyncTriggerFence(SyncFence * pFence); miSyncTriggerFence(SyncFence * pFence);
@ -77,25 +77,4 @@ extern _X_EXPORT SyncScreenFuncsPtr miSyncGetScreenFuncs(ScreenPtr pScreen);
extern _X_EXPORT Bool extern _X_EXPORT Bool
miSyncSetup(ScreenPtr pScreen); 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_ */ #endif /* _MISYNC_H_ */

33
miext/sync/misync_priv.h Normal file
View File

@ -0,0 +1,33 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
* 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 */

2
miext/sync/misyncfd.c
View File

@ -25,7 +25,7 @@
#endif #endif
#include "scrnintstr.h" #include "scrnintstr.h"
#include "misync.h" #include "misync_priv.h"
#include "misyncstr.h" #include "misyncstr.h"
#include "misyncfd.h" #include "misyncfd.h"
#include "pixmapstr.h" #include "pixmapstr.h"

2
miext/sync/misyncshm.c
View File

@ -25,7 +25,7 @@
#endif #endif
#include "scrnintstr.h" #include "scrnintstr.h"
#include "misync.h" #include "misync_priv.h"
#include "misyncstr.h" #include "misyncstr.h"
#include "misyncshm.h" #include "misyncshm.h"
#include "misyncfd.h" #include "misyncfd.h"

14
miext/sync/misyncstr.h
View File

@ -78,18 +78,4 @@ typedef struct _SyncTriggerList {
struct _SyncTriggerList *next; struct _SyncTriggerList *next;
} SyncTriggerList; } 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_ */ #endif /* _MISYNCSTR_H_ */