7f962c70b6
As shown by DRI3 adding the SyncCreateFenceFromFD() function, extensions may want to create a fence, then initialize it in their own way. This currently can't be done without adding a function directly to Xext/sync.c due to the fact that the RTFence resource type is private and there is no external interface to add to it. To facilitate other X extensions creating fences and initializing them, this change exports SyncCreate() and adds the resource directly within it. Callers no longer need to call AddResource() after SyncCreate(), they only need to initialize the SyncObject. To prevent FreeFence() and FreeCounter() from segfaulting if the call to AddResource() fails before the sync object is initialized, this adds a new 'initialized' parameter to SyncObject that, when FALSE, causes FreeFence() and FreeCounter() to skip de-initialization and simply free the object. Initialization after adding the resource shouldn't otherwise be a problem due to the single-threaded nature of X. Signed-off-by: Alex Goins <agoins@nvidia.com> Reviewed-by: James Jones <jajones@nvidia.com> Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
102 lines
3.5 KiB
C
102 lines
3.5 KiB
C
/*
|
|
* Copyright © 2010 NVIDIA Corporation
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
#include <dix-config.h>
|
|
#endif
|
|
|
|
#ifndef _MISYNC_H_
|
|
#define _MISYNC_H_
|
|
|
|
typedef struct _SyncObject SyncObject;
|
|
typedef struct _SyncFence SyncFence;
|
|
typedef struct _SyncTrigger SyncTrigger;
|
|
|
|
typedef void (*SyncScreenCreateFenceFunc) (ScreenPtr pScreen,
|
|
SyncFence * pFence,
|
|
Bool initially_triggered);
|
|
typedef void (*SyncScreenDestroyFenceFunc) (ScreenPtr pScreen,
|
|
SyncFence * pFence);
|
|
|
|
typedef struct _syncScreenFuncs {
|
|
SyncScreenCreateFenceFunc CreateFence;
|
|
SyncScreenDestroyFenceFunc DestroyFence;
|
|
} SyncScreenFuncsRec, *SyncScreenFuncsPtr;
|
|
|
|
|
|
extern _X_EXPORT void
|
|
miSyncScreenCreateFence(ScreenPtr pScreen, SyncFence * pFence,
|
|
Bool initially_triggered);
|
|
extern _X_EXPORT void
|
|
miSyncScreenDestroyFence(ScreenPtr pScreen, SyncFence * pFence);
|
|
|
|
typedef void (*SyncFenceSetTriggeredFunc) (SyncFence * pFence);
|
|
typedef void (*SyncFenceResetFunc) (SyncFence * pFence);
|
|
typedef Bool (*SyncFenceCheckTriggeredFunc) (SyncFence * pFence);
|
|
typedef void (*SyncFenceAddTriggerFunc) (SyncTrigger * pTrigger);
|
|
typedef void (*SyncFenceDeleteTriggerFunc) (SyncTrigger * pTrigger);
|
|
|
|
typedef struct _syncFenceFuncs {
|
|
SyncFenceSetTriggeredFunc SetTriggered;
|
|
SyncFenceResetFunc Reset;
|
|
SyncFenceCheckTriggeredFunc CheckTriggered;
|
|
SyncFenceAddTriggerFunc AddTrigger;
|
|
SyncFenceDeleteTriggerFunc DeleteTrigger;
|
|
} 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);
|
|
|
|
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_ */
|