82f01ad786
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>
(cherry picked from commit 7f962c70b6)
96 lines
3.4 KiB
C
96 lines
3.4 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 _MISYNCSTR_H_
|
|
#define _MISYNCSTR_H_
|
|
|
|
#include <stdint.h>
|
|
#include "dix.h"
|
|
#include "misync.h"
|
|
#include "scrnintstr.h"
|
|
#include <X11/extensions/syncconst.h>
|
|
|
|
/* Sync object types */
|
|
#define SYNC_COUNTER 0
|
|
#define SYNC_FENCE 1
|
|
|
|
struct _SyncObject {
|
|
ClientPtr client; /* Owning client. 0 for system counters */
|
|
struct _SyncTriggerList *pTriglist; /* list of triggers */
|
|
XID id; /* resource ID */
|
|
unsigned char type; /* SYNC_* */
|
|
Bool initialized; /* FALSE if created but not initialized */
|
|
Bool beingDestroyed; /* in process of going away */
|
|
};
|
|
|
|
typedef struct _SyncCounter {
|
|
SyncObject sync; /* Common sync object data */
|
|
int64_t value; /* counter value */
|
|
struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */
|
|
} SyncCounter;
|
|
|
|
struct _SyncFence {
|
|
SyncObject sync; /* Common sync object data */
|
|
ScreenPtr pScreen; /* Screen of this fence object */
|
|
SyncFenceFuncsRec funcs; /* Funcs for performing ops on fence */
|
|
Bool triggered; /* fence state */
|
|
PrivateRec *devPrivates; /* driver-specific per-fence data */
|
|
};
|
|
|
|
struct _SyncTrigger {
|
|
SyncObject *pSync;
|
|
int64_t wait_value; /* wait value */
|
|
unsigned int value_type; /* Absolute or Relative */
|
|
unsigned int test_type; /* transition or Comparision type */
|
|
int64_t test_value; /* trigger event threshold value */
|
|
Bool (*CheckTrigger)(struct _SyncTrigger *pTrigger,
|
|
int64_t newval);
|
|
void (*TriggerFired)(struct _SyncTrigger *pTrigger);
|
|
void (*CounterDestroyed)(struct _SyncTrigger *pTrigger);
|
|
};
|
|
|
|
typedef struct _SyncTriggerList {
|
|
SyncTrigger *pTrigger;
|
|
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_ */
|