diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-19 12:16:20 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-19 12:16:20 +0000 |
| commit | 0b53765917ae196147886189ca3514a07e0eb45e (patch) | |
| tree | 0188ad84af0b6949528ff8c53c2d16f24a9f1eea /xorg-server/hw/xfree86/dri2/dri2ext.c | |
| parent | 0b8629ada4293370d220bbb7e6c195c711baee7d (diff) | |
| download | vcxsrv-0b53765917ae196147886189ca3514a07e0eb45e.tar.gz vcxsrv-0b53765917ae196147886189ca3514a07e0eb45e.tar.bz2 vcxsrv-0b53765917ae196147886189ca3514a07e0eb45e.zip | |
svn merge -r537:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/hw/xfree86/dri2/dri2ext.c')
| -rw-r--r-- | xorg-server/hw/xfree86/dri2/dri2ext.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/xorg-server/hw/xfree86/dri2/dri2ext.c b/xorg-server/hw/xfree86/dri2/dri2ext.c index 094d54dc0..17df1304e 100644 --- a/xorg-server/hw/xfree86/dri2/dri2ext.c +++ b/xorg-server/hw/xfree86/dri2/dri2ext.c @@ -51,7 +51,6 @@ #include "xf86Module.h" static ExtensionEntry *dri2Extension; -static RESTYPE dri2DrawableRes; static Bool validDrawable(ClientPtr client, XID drawable, Mask access_mode, @@ -172,11 +171,6 @@ ProcDRI2CreateDrawable(ClientPtr client) if (status != Success) return status; - if (!AddResource(stuff->drawable, dri2DrawableRes, pDrawable)) { - DRI2DestroyDrawable(pDrawable); - return BadAlloc; - } - return client->noClientException; } @@ -192,8 +186,6 @@ ProcDRI2DestroyDrawable(ClientPtr client) &pDrawable, &status)) return status; - FreeResourceByType(stuff->drawable, dri2DrawableRes, FALSE); - return client->noClientException; } @@ -627,25 +619,11 @@ SProcDRI2Dispatch (ClientPtr client) } } -static int DRI2DrawableGone(pointer p, XID id) -{ - DrawablePtr pDrawable = p; - - DRI2DestroyDrawable(pDrawable); - - return Success; -} - int DRI2EventBase; static void DRI2ExtensionInit(void) { - dri2DrawableRes = CreateNewResourceType(DRI2DrawableGone, "DRI2Drawable"); - - if (!dri2DrawableRes) - return; - dri2Extension = AddExtension(DRI2_NAME, DRI2NumberEvents, DRI2NumberErrors, |