Commit 895f4079 authored by Alan Coopersmith's avatar Alan Coopersmith Committed by Keith Packard
Browse files

Add type name argument to CreateNewResourceType



Convert all calls of CreateNewResourceType to pass name argument

Breaks DIX ABI.

ABI versions bumped:
Signed-off-by: default avatarAlan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Keith Packard's avatarKeith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard's avatarKeith Packard <keithp@keithp.com>
parent a11c58fa
......@@ -42,8 +42,6 @@ in this Software without prior written authorization from The Open Group.
#include "opaque.h"
#include "sleepuntil.h"
#include "inputstr.h"
#include "registry.h"
#include <X11/extensions/multibufconst.h>
#include <X11/extensions/multibufproto.h>
......@@ -469,12 +467,15 @@ MultibufferExtensionInit()
* create the resource types
*/
MultibufferDrawableResType =
CreateNewResourceType(MultibufferDrawableDelete);
CreateNewResourceType(MultibufferDrawableDelete, "MultibufferDrawable");
if (MultiBufferDrawableResType)
MultibufferDrawableResType |= RC_DRAWABLE;
MultibufferResType = CreateNewResourceType(MultibufferDelete);
MultibuffersResType = CreateNewResourceType(MultibuffersDelete);
OtherClientResType = CreateNewResourceType(OtherClientDelete);
MultibufferResType = CreateNewResourceType(MultibufferDelete,
"MultibufferBuffer");
MultibuffersResType = CreateNewResourceType(MultibuffersDelete,
"MultibufferWindow");
OtherClientResType = CreateNewResourceType(OtherClientDelete,
"MultibufferOtherClient");
if (MultibufferDrawableResType && MultibufferResType &&
MultibuffersResType && OtherClientResType &&
(extEntry = AddExtension(MULTIBUFFER_PROTOCOL_NAME,
......@@ -483,11 +484,6 @@ MultibufferExtensionInit()
ProcMultibufferDispatch, SProcMultibufferDispatch,
MultibufferResetProc, StandardMinorOpcode)))
{
RegisterResourceName(MultibufferDrawableResType,
"MultibufferDrawable");
RegisterResourceName(MultibufferResType, "MultibufferBuffer");
RegisterResourceName(MultibuffersResType, "MultibufferWindow");
RegisterResourceName(OtherClientResType, "MultibufferOtherClient");
MultibufferEventBase = extEntry->eventBase;
MultibufferErrorBase = extEntry->errorBase;
EventSwapVector[MultibufferEventBase + MultibufferClobberNotify] = (EventSwapPtr) SClobberNotifyEvent;
......
......@@ -52,7 +52,6 @@ Equipment Corporation.
#include "globals.h"
#include "servermd.h"
#include "resource.h"
#include "registry.h"
#ifdef RENDER
#include "picturestr.h"
#endif
......@@ -504,21 +503,20 @@ void PanoramiXExtensionInit(int argc, char *argv[])
}
XRC_DRAWABLE = CreateNewResourceClass();
XRT_WINDOW = CreateNewResourceType(XineramaDeleteResource);
XRT_WINDOW = CreateNewResourceType(XineramaDeleteResource,
"XineramaWindow");
if (XRT_WINDOW)
XRT_WINDOW |= XRC_DRAWABLE;
XRT_PIXMAP = CreateNewResourceType(XineramaDeleteResource);
XRT_PIXMAP = CreateNewResourceType(XineramaDeleteResource,
"XineramaPixmap");
if (XRT_PIXMAP)
XRT_PIXMAP |= XRC_DRAWABLE;
XRT_GC = CreateNewResourceType(XineramaDeleteResource);
XRT_COLORMAP = CreateNewResourceType(XineramaDeleteResource);
XRT_GC = CreateNewResourceType(XineramaDeleteResource,
"XineramaGC");
XRT_COLORMAP = CreateNewResourceType(XineramaDeleteResource,
"XineramaColormap");
if (XRT_WINDOW && XRT_PIXMAP && XRT_GC && XRT_COLORMAP) {
RegisterResourceName(XRT_WINDOW, "XineramaWindow");
RegisterResourceName(XRT_PIXMAP, "XineramaPixmap");
RegisterResourceName(XRT_GC, "XineramaGC");
RegisterResourceName(XRT_COLORMAP, "XineramaColormap");
panoramiXGeneration = serverGeneration;
success = TRUE;
}
......
......@@ -47,7 +47,6 @@ in this Software without prior written authorization from the X Consortium.
#include "cursorstr.h"
#include "colormapst.h"
#include "xace.h"
#include "registry.h"
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
......@@ -253,9 +252,11 @@ ScreenSaverExtensionInit(INITARGS)
int i;
ScreenPtr pScreen;
AttrType = CreateNewResourceType(ScreenSaverFreeAttr);
SaverEventType = CreateNewResourceType(ScreenSaverFreeEvents);
SuspendType = CreateNewResourceType(ScreenSaverFreeSuspend);
AttrType = CreateNewResourceType(ScreenSaverFreeAttr, "SaverAttr");
SaverEventType = CreateNewResourceType(ScreenSaverFreeEvents,
"SaverEvent");
SuspendType = CreateNewResourceType(ScreenSaverFreeSuspend,
"SaverSuspend");
for (i = 0; i < screenInfo.numScreens; i++)
{
......@@ -267,9 +268,6 @@ ScreenSaverExtensionInit(INITARGS)
ProcScreenSaverDispatch, SProcScreenSaverDispatch,
NULL, StandardMinorOpcode)))
{
RegisterResourceName(AttrType, "SaverAttr");
RegisterResourceName(SaverEventType, "SaverEvent");
RegisterResourceName(SuspendType, "SaverSuspend");
ScreenSaverEventBase = extEntry->eventBase;
EventSwapVector[ScreenSaverEventBase] = (EventSwapPtr) SScreenSaverNotifyEvent;
}
......
......@@ -1105,17 +1105,17 @@ SecurityExtensionInit(INITARGS)
int ret = TRUE;
SecurityAuthorizationResType =
CreateNewResourceType(SecurityDeleteAuthorization);
CreateNewResourceType(SecurityDeleteAuthorization,
"SecurityAuthorization");
RTEventClient = CreateNewResourceType(
SecurityDeleteAuthorizationEventClient);
RTEventClient =
CreateNewResourceType(SecurityDeleteAuthorizationEventClient,
"SecurityEventClient");
if (!SecurityAuthorizationResType || !RTEventClient)
return;
RTEventClient |= RC_NEVERRETAIN;
RegisterResourceName(SecurityAuthorizationResType, "SecurityAuthorization");
RegisterResourceName(RTEventClient, "SecurityEventClient");
/* Allocate the private storage */
if (!dixRequestPrivate(stateKey, sizeof(SecurityStateRec)))
......
......@@ -40,7 +40,6 @@ in this Software without prior written authorization from The Open Group.
#include "extnsionst.h"
#include "dixstruct.h"
#include "resource.h"
#include "registry.h"
#include "opaque.h"
#include <X11/extensions/shapeproto.h>
#include "regionstr.h"
......@@ -128,15 +127,13 @@ ShapeExtensionInit(void)
{
ExtensionEntry *extEntry;
ClientType = CreateNewResourceType(ShapeFreeClient);
ShapeEventType = CreateNewResourceType(ShapeFreeEvents);
ClientType = CreateNewResourceType(ShapeFreeClient, "ShapeClient");
ShapeEventType = CreateNewResourceType(ShapeFreeEvents, "ShapeEvent");
if (ClientType && ShapeEventType &&
(extEntry = AddExtension(SHAPENAME, ShapeNumberEvents, 0,
ProcShapeDispatch, SProcShapeDispatch,
NULL, StandardMinorOpcode)))
{
RegisterResourceName(ClientType, "ShapeClient");
RegisterResourceName(ShapeEventType, "ShapeEvent");
ShapeEventBase = extEntry->eventBase;
EventSwapVector[ShapeEventBase] = (EventSwapPtr) SShapeNotifyEvent;
}
......
......@@ -52,7 +52,6 @@ in this Software without prior written authorization from The Open Group.
#include "servermd.h"
#include "shmint.h"
#include "xace.h"
#include "registry.h"
#include <X11/extensions/shmproto.h>
#include <X11/Xfuncproto.h>
#include "protocol-versions.h"
......@@ -278,13 +277,12 @@ ShmExtensionInit(INITARGS)
screenInfo.screens[i]->DestroyPixmap = ShmDestroyPixmap;
}
}
ShmSegType = CreateNewResourceType(ShmDetachSegment);
ShmSegType = CreateNewResourceType(ShmDetachSegment, "ShmSeg");
if (ShmSegType &&
(extEntry = AddExtension(SHMNAME, ShmNumberEvents, ShmNumberErrors,
ProcShmDispatch, SProcShmDispatch,
ShmResetProc, StandardMinorOpcode)))
{
RegisterResourceName(ShmSegType, "ShmSeg");
ShmReqCode = (unsigned char)extEntry->base;
ShmCompletionCode = extEntry->eventBase;
BadShmSegCode = extEntry->errorBase;
......
......@@ -39,7 +39,6 @@ in this Software without prior written authorization from The Open Group.
#include "dixstruct.h"
#include "pixmapstr.h"
#include "scrnintstr.h"
#include "registry.h"
typedef struct _Sertafied {
struct _Sertafied *next;
......@@ -88,10 +87,10 @@ ClientSleepUntil (ClientPtr client,
if (SertafiedGeneration != serverGeneration)
{
SertafiedResType = CreateNewResourceType (SertafiedDelete);
SertafiedResType = CreateNewResourceType (SertafiedDelete,
"ClientSleep");
if (!SertafiedResType)
return FALSE;
RegisterResourceName(SertafiedResType, "ClientSleep");
SertafiedGeneration = serverGeneration;
BlockHandlerRegistered = FALSE;
}
......
......@@ -64,7 +64,6 @@ PERFORMANCE OF THIS SOFTWARE.
#include "extnsionst.h"
#include "dixstruct.h"
#include "resource.h"
#include "registry.h"
#include "opaque.h"
#include <X11/extensions/syncproto.h>
#include "syncsrv.h"
......@@ -874,12 +873,11 @@ SyncCreateSystemCounter(
*/
if (RTCounter == 0)
{
RTCounter = CreateNewResourceType(FreeCounter);
RTCounter = CreateNewResourceType(FreeCounter, "SyncCounter");
if (RTCounter == 0)
{
return NULL;
}
RegisterResourceName(RTCounter, "SyncCounter");
}
pCounter = SyncCreateCounter(NULL, FakeClientID(0), initial);
......@@ -2112,13 +2110,13 @@ SyncExtensionInit(void)
if (RTCounter == 0)
{
RTCounter = CreateNewResourceType(FreeCounter);
RTCounter = CreateNewResourceType(FreeCounter, "SyncCounter");
}
RTAlarm = CreateNewResourceType(FreeAlarm);
RTAwait = CreateNewResourceType(FreeAwait);
RTAlarm = CreateNewResourceType(FreeAlarm, "SyncAlarm");
RTAwait = CreateNewResourceType(FreeAwait, "SyncAwait");
if (RTAwait)
RTAwait |= RC_NEVERRETAIN;
RTAlarmClient = CreateNewResourceType(FreeAlarmClient);
RTAlarmClient = CreateNewResourceType(FreeAlarmClient, "SyncAlarmClient");
if (RTAlarmClient)
RTAlarmClient |= RC_NEVERRETAIN;
......@@ -2135,10 +2133,6 @@ SyncExtensionInit(void)
return;
}
RegisterResourceName(RTCounter, "SyncCounter");
RegisterResourceName(RTAlarm, "SyncAlarm");
RegisterResourceName(RTAwait, "SyncAwait");
RegisterResourceName(RTAlarmClient, "SyncAlarmClient");
SyncEventBase = extEntry->eventBase;
SyncErrorBase = extEntry->errorBase;
EventSwapVector[SyncEventBase + XSyncCounterNotify] = (EventSwapPtr) SCounterNotifyEvent;
......
......@@ -36,7 +36,6 @@ SOFTWARE.
#include "gcstruct.h"
#include "dixstruct.h"
#include "resource.h"
#include "registry.h"
#include "opaque.h"
#include <X11/extensions/Xv.h>
......@@ -1864,12 +1863,10 @@ void XineramifyXv(void)
XvAdaptorPtr MatchingAdaptors[MAXSCREENS];
int i, j, k, l;
XvXRTPort = CreateNewResourceType(XineramaDeleteResource);
XvXRTPort = CreateNewResourceType(XineramaDeleteResource, "XvXRTPort");
if (!xvsp0 || !XvXRTPort) return;
RegisterResourceName(XvXRTPort, "XvXRTPort");
for(i = 0; i < xvsp0->nAdaptors; i++) {
refAdapt = xvsp0->pAdaptors + i;
......
......@@ -90,7 +90,6 @@ SOFTWARE.
#include "extnsionst.h"
#include "dixstruct.h"
#include "resource.h"
#include "registry.h"
#include "opaque.h"
#include "input.h"
......@@ -209,47 +208,45 @@ CreateResourceTypes(void)
XvResourceGeneration = serverGeneration;
if (!(XvRTPort = CreateNewResourceType(XvdiDestroyPort)))
if (!(XvRTPort = CreateNewResourceType(XvdiDestroyPort, "XvRTPort")))
{
ErrorF("CreateResourceTypes: failed to allocate port resource.\n");
return FALSE;
}
RegisterResourceName(XvRTPort, "XvRTPort");
if (!(XvRTGrab = CreateNewResourceType(XvdiDestroyGrab)))
if (!(XvRTGrab = CreateNewResourceType(XvdiDestroyGrab, "XvRTGrab")))
{
ErrorF("CreateResourceTypes: failed to allocate grab resource.\n");
return FALSE;
}
RegisterResourceName(XvRTGrab, "XvRTGrab");
if (!(XvRTEncoding = CreateNewResourceType(XvdiDestroyEncoding)))
if (!(XvRTEncoding = CreateNewResourceType(XvdiDestroyEncoding,
"XvRTEncoding")))
{
ErrorF("CreateResourceTypes: failed to allocate encoding resource.\n");
return FALSE;
}
RegisterResourceName(XvRTEncoding, "XvRTEncoding");
if (!(XvRTVideoNotify = CreateNewResourceType(XvdiDestroyVideoNotify)))
if (!(XvRTVideoNotify = CreateNewResourceType(XvdiDestroyVideoNotify,
"XvRTVideoNotify")))
{
ErrorF("CreateResourceTypes: failed to allocate video notify resource.\n");
return FALSE;
}
RegisterResourceName(XvRTVideoNotify, "XvRTVideoNotify");
if (!(XvRTVideoNotifyList = CreateNewResourceType(XvdiDestroyVideoNotifyList)))
if (!(XvRTVideoNotifyList = CreateNewResourceType(XvdiDestroyVideoNotifyList,
"XvRTVideoNotifyList")))
{
ErrorF("CreateResourceTypes: failed to allocate video notify list resource.\n");
return FALSE;
}
RegisterResourceName(XvRTVideoNotifyList, "XvRTVideoNotifyList");
if (!(XvRTPortNotify = CreateNewResourceType(XvdiDestroyPortNotify)))
if (!(XvRTPortNotify = CreateNewResourceType(XvdiDestroyPortNotify,
"XvRTPortNotify")))
{
ErrorF("CreateResourceTypes: failed to allocate port notify resource.\n");
return FALSE;
}
RegisterResourceName(XvRTPortNotify, "XvRTPortNotify");
return TRUE;
......
......@@ -11,7 +11,6 @@
#include "os.h"
#include "dixstruct.h"
#include "resource.h"
#include "registry.h"
#include "scrnintstr.h"
#include "extnsionst.h"
#include "servermd.h"
......@@ -675,17 +674,17 @@ XvMCExtensionInit(void)
if(XvMCScreenKey == NULL) /* nobody supports it */
return;
if(!(XvMCRTContext = CreateNewResourceType(XvMCDestroyContextRes)))
if(!(XvMCRTContext = CreateNewResourceType(XvMCDestroyContextRes,
"XvMCRTContext")))
return;
RegisterResourceName(XvMCRTContext, "XvMCRTContext");
if(!(XvMCRTSurface = CreateNewResourceType(XvMCDestroySurfaceRes)))
if(!(XvMCRTSurface = CreateNewResourceType(XvMCDestroySurfaceRes,
"XvMCRTSurface")))
return;
RegisterResourceName(XvMCRTSurface, "XvMCRTSurface");
if(!(XvMCRTSubpicture = CreateNewResourceType(XvMCDestroySubpictureRes)))
if(!(XvMCRTSubpicture = CreateNewResourceType(XvMCDestroySubpictureRes,
"XvMCRTSubpicture")))
return;
RegisterResourceName(XvMCRTSubpicture, "XvMCRTSubpicture");
extEntry = AddExtension(XvMCName, XvMCNumEvents, XvMCNumErrors,
ProcXvMCDispatch, SProcXvMCDispatch,
......
......@@ -70,7 +70,6 @@ SOFTWARE.
#include "extinit.h"
#include "exglobals.h"
#include "swaprep.h"
#include "registry.h"
#include "privates.h"
#include "protocol-versions.h"
......@@ -1269,10 +1268,10 @@ XInputExtensionInit(void)
IEventBase = extEntry->eventBase;
XIVersion = thisversion;
MakeDeviceTypeAtoms();
RT_INPUTCLIENT = CreateNewResourceType((DeleteType) InputClientGone);
RT_INPUTCLIENT = CreateNewResourceType((DeleteType) InputClientGone,
"INPUTCLIENT");
if (!RT_INPUTCLIENT)
FatalError("Failed to add resource type for XI.\n");
RegisterResourceName(RT_INPUTCLIENT, "INPUTCLIENT");
FixExtensionEvents(extEntry);
ReplySwapVector[IReqCode] = (ReplySwapPtr) SReplyIDispatch;
EventSwapVector[DeviceValuator] = SEventIDispatch;
......
......@@ -47,7 +47,6 @@
#include "compint.h"
#include "xace.h"
#include "registry.h"
#include "protocol-versions.h"
static CARD8 CompositeReqCode;
......@@ -547,22 +546,20 @@ CompositeExtensionInit (void)
return;
#endif
CompositeClientWindowType = CreateNewResourceType (FreeCompositeClientWindow);
CompositeClientWindowType = CreateNewResourceType
(FreeCompositeClientWindow, "CompositeClientWindow");
if (!CompositeClientWindowType)
return;
RegisterResourceName(CompositeClientWindowType, "CompositeClientWindow");
CompositeClientSubwindowsType = CreateNewResourceType (FreeCompositeClientSubwindows);
CompositeClientSubwindowsType = CreateNewResourceType
(FreeCompositeClientSubwindows, "CompositeClientSubwindows");
if (!CompositeClientSubwindowsType)
return;
RegisterResourceName(CompositeClientSubwindowsType,
"CompositeClientSubwindows");
CompositeClientOverlayType = CreateNewResourceType (FreeCompositeClientOverlay);
CompositeClientOverlayType = CreateNewResourceType
(FreeCompositeClientOverlay, "CompositeClientOverlay");
if (!CompositeClientOverlayType)
return;
RegisterResourceName(CompositeClientOverlayType,
"CompositeClientOverlay");
if (!dixRequestPrivate(CompositeClientPrivateKey,
sizeof(CompositeClientRec)))
......
......@@ -24,7 +24,6 @@
#include <dix-config.h>
#endif
#include "registry.h"
#include "damageextint.h"
#include "protocol-versions.h"
......@@ -498,15 +497,13 @@ DamageExtensionInit(void)
for (s = 0; s < screenInfo.numScreens; s++)
DamageSetup (screenInfo.screens[s]);
DamageExtType = CreateNewResourceType (FreeDamageExt);
DamageExtType = CreateNewResourceType (FreeDamageExt, "DamageExt");
if (!DamageExtType)
return;
RegisterResourceName(DamageExtType, "DamageExt");
DamageExtWinType = CreateNewResourceType (FreeDamageExtWin);
DamageExtWinType = CreateNewResourceType (FreeDamageExtWin, "DamageExtWin");
if (!DamageExtWinType)
return;
RegisterResourceName(DamageExtWinType, "DamageExtWin");
if (!dixRequestPrivate(DamageClientPrivateKey, sizeof (DamageClientRec)))
return;
......
......@@ -54,7 +54,6 @@
#include "dbestruct.h"
#include "midbe.h"
#include "xace.h"
#include "registry.h"
/* GLOBALS */
......@@ -1574,17 +1573,15 @@ DbeExtensionInit(void)
/* Create the resource types. */
dbeDrawableResType =
CreateNewResourceType(DbeDrawableDelete);
CreateNewResourceType(DbeDrawableDelete, "dbeDrawable");
if (!dbeDrawableResType)
return;
dbeDrawableResType |= RC_DRAWABLE;
RegisterResourceName(dbeDrawableResType, "dbeDrawable");
dbeWindowPrivResType =
CreateNewResourceType(DbeWindowPrivDelete);
CreateNewResourceType(DbeWindowPrivDelete, "dbeWindow");
if (!dbeWindowPrivResType)
return;
RegisterResourceName(dbeWindowPrivResType, "dbeWindow");
if (!dixRegisterPrivateOffset(dbeDrawableResType,
offsetof(PixmapRec, devPrivates)))
......
......@@ -141,10 +141,10 @@ Equipment Corporation.
#endif
#include "xace.h"
#include <assert.h>
#include "registry.h"
#ifdef XSERVER_DTRACE
#include <sys/types.h>
#include "registry.h"
typedef const char *string;
#include "Xserver-dtrace.h"
......@@ -197,7 +197,7 @@ CallResourceStateCallback(ResourceState state, ResourceRec *res)
}
RESTYPE
CreateNewResourceType(DeleteType deleteFunc)
CreateNewResourceType(DeleteType deleteFunc, char *name)
{
RESTYPE next = lastResourceType + 1;
DeleteType *funcs;
......@@ -214,6 +214,10 @@ CreateNewResourceType(DeleteType deleteFunc)
lastResourceType = next;
DeleteFuncs = funcs;
DeleteFuncs[next] = deleteFunc;
/* Called even if name is NULL, to remove any previous entry */
RegisterResourceName(next, name);
return next;
}
......
......@@ -343,17 +343,15 @@ void GlxExtensionInit(void)
__GLXprovider *p;
Bool glx_provided = False;
__glXContextRes = CreateNewResourceType((DeleteType)ContextGone);
__glXDrawableRes = CreateNewResourceType((DeleteType)DrawableGone);
__glXSwapBarrierRes = CreateNewResourceType((DeleteType)SwapBarrierGone);
__glXContextRes = CreateNewResourceType((DeleteType)ContextGone,
"GLXContext");
__glXDrawableRes = CreateNewResourceType((DeleteType)DrawableGone,
"GLXDrawable");
__glXSwapBarrierRes = CreateNewResourceType((DeleteType)SwapBarrierGone,
"GLXSwapBarrier");
if (!__glXContextRes || !__glXDrawableRes || !__glXSwapBarrierRes)
return;
RegisterResourceName(__glXContextRes, "GLXContext");
RegisterResourceName(__glXDrawableRes, "GLXDrawable");
RegisterResourceName(__glXSwapBarrierRes, "GLXSwapBarrier");
if (!dixRequestPrivate(glxClientPrivateKey, sizeof (__GLXclientState)))
return;
if (!AddCallback (&ClientStateCallback, glxClientCallback, 0))
......
......@@ -44,7 +44,6 @@
#include "glxvisuals.h"
#include "micmap.h"
#include "glxswap.h"
#include "registry.h"
/*
** Stubs to satisfy miinitext.c references.
......@@ -294,22 +293,21 @@ void GlxExtensionInit(void)
return;
}
__glXContextRes = CreateNewResourceType((DeleteType)ContextGone);
__glXClientRes = CreateNewResourceType((DeleteType)ClientGone);
__glXPixmapRes = CreateNewResourceType((DeleteType)PixmapGone);
__glXWindowRes = CreateNewResourceType((DeleteType)WindowGone);
__glXPbufferRes = CreateNewResourceType((DeleteType)PbufferGone);
__glXContextRes = CreateNewResourceType((DeleteType)ContextGone,
"GLXContext");
__glXClientRes = CreateNewResourceType((DeleteType)ClientGone,
"GLXClient");
__glXPixmapRes = CreateNewResourceType((DeleteType)PixmapGone,
"GLXPixmap");
__glXWindowRes = CreateNewResourceType((DeleteType)WindowGone,
"GLXWindow");
__glXPbufferRes = CreateNewResourceType((DeleteType)PbufferGone,
"GLXPbuffer");
if (!__glXContextRes || !__glXClientRes || !__glXPixmapRes ||
!__glXWindowRes || !__glXPbufferRes)
return;
RegisterResourceName(__glXContextRes, "GLXContext");
RegisterResourceName(__glXClientRes, "GLXClient");
RegisterResourceName(__glXPixmapRes, "GLXPixmap");
RegisterResourceName(__glXWindowRes, "GLXWindow");
RegisterResourceName(__glXPbufferRes, "GLXPbuffer");
/*
** Add extension to server extensions.
*/
......
......@@ -43,7 +43,6 @@
#include "privates.h"
#include "dixstruct.h"
#include "extnsionst.h"
#include "registry.h"
#include "colormapst.h"
#include "cursorstr.h"
#include "scrnintstr.h"
......@@ -141,12 +140,11 @@ ephyrDRIExtensionInit (ScreenPtr a_screen)
EPHYR_LOG ("host X does have XShape extension\n") ;
#ifdef XF86DRI_EVENTS
EventType = CreateNewResourceType (XF86DRIFreeEvents);
EventType = CreateNewResourceType (XF86DRIFreeEvents, "DRIEvents");
if (!EventType) {
EPHYR_LOG_ERROR ("failed to register DRI event resource type\n") ;
goto out ;
}
RegisterResourceName(EventType, "DRIEvents");
#endif
if ((extEntry = AddExtension(XF86DRINAME,
......
......@@ -82,9 +82,9 @@ typedef enum {
* mask is 0xFFFF0000.
*/
#define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4)
#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(6, 0)
#define ABI_XINPUT_VERSION SET_ABI_VERSION(7, 0)
#define ABI_EXTENSION_VERSION SET_ABI_VERSION(2, 0)
#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(7, 0)
#define ABI_XINPUT_VERSION SET_ABI_VERSION(8, 0)
#define ABI_EXTENSION_VERSION SET_ABI_VERSION(3, 0)
#define ABI_FONT_VERSION SET_ABI_VERSION(0, 6)