summaryrefslogtreecommitdiff
path: root/hw/dmx/glxProxy
diff options
context:
space:
mode:
Diffstat (limited to 'hw/dmx/glxProxy')
-rw-r--r--hw/dmx/glxProxy/glxcmds.c22
-rw-r--r--hw/dmx/glxProxy/glxext.c6
-rw-r--r--hw/dmx/glxProxy/glxscreens.c8
-rw-r--r--hw/dmx/glxProxy/glxsingle.c8
-rw-r--r--hw/dmx/glxProxy/glxswap.c10
-rw-r--r--hw/dmx/glxProxy/glxutil.c2
-rw-r--r--hw/dmx/glxProxy/glxvendor.c4
-rw-r--r--hw/dmx/glxProxy/glxvisuals.c2
-rw-r--r--hw/dmx/glxProxy/unpack.h2
9 files changed, 32 insertions, 32 deletions
diff --git a/hw/dmx/glxProxy/glxcmds.c b/hw/dmx/glxProxy/glxcmds.c
index 31fd431e7..d9b884a8f 100644
--- a/hw/dmx/glxProxy/glxcmds.c
+++ b/hw/dmx/glxProxy/glxcmds.c
@@ -2448,7 +2448,7 @@ int __glXQueryExtensionsString(__GLXclientState *cl, GLbyte *pc)
len = (int)be_reply.length;
numbytes = (int)be_reply.n;
slop = numbytes * __GLX_SIZE_INT8 & 3;
- be_buf = (char *)Xalloc(numbytes);
+ be_buf = (char *)malloc(numbytes);
if (!be_buf) {
/* Throw data on the floor */
_XEatData(dpy, len);
@@ -2526,7 +2526,7 @@ int __glXQueryServerString(__GLXclientState *cl, GLbyte *pc)
len = (int)be_reply.length;
numbytes = (int)be_reply.n;
slop = numbytes * __GLX_SIZE_INT8 & 3;
- be_buf = (char *)Xalloc(numbytes);
+ be_buf = (char *)malloc(numbytes);
if (!be_buf) {
/* Throw data on the floor */
_XEatData(dpy, len);
@@ -2947,7 +2947,7 @@ int __glXCreateWindow(__GLXclientState *cl, GLbyte *pc)
return BadAlloc;
}
- pGlxWindow = (__glXWindow *) xalloc(sizeof(__glXWindow));
+ pGlxWindow = (__glXWindow *) malloc(sizeof(__glXWindow));
if (!pGlxWindow) {
return BadAlloc;
}
@@ -3016,7 +3016,7 @@ int __glXQueryContext(__GLXclientState *cl, GLbyte *pc)
reply.n = nProps;
nReplyBytes = reply.length << 2;
- sendBuf = (int *)xalloc(nReplyBytes);
+ sendBuf = (int *)malloc(nReplyBytes);
pSendBuf = sendBuf;
*pSendBuf++ = GLX_FBCONFIG_ID;
*pSendBuf++ = (int)(ctx->pFBConfig->id);
@@ -3031,7 +3031,7 @@ int __glXQueryContext(__GLXclientState *cl, GLbyte *pc)
WriteToClient(client, sz_xGLXQueryContextReply, (char *)&reply);
WriteToClient(client, nReplyBytes, (char *)sendBuf);
}
- xfree((char *)sendBuf);
+ free((char *)sendBuf);
return Success;
}
@@ -3061,7 +3061,7 @@ int __glXQueryContextInfoEXT(__GLXclientState *cl, GLbyte *pc)
reply.n = nProps;
nReplyBytes = reply.length << 2;
- sendBuf = (int *)xalloc(nReplyBytes);
+ sendBuf = (int *)malloc(nReplyBytes);
pSendBuf = sendBuf;
*pSendBuf++ = GLX_SHARE_CONTEXT_EXT;
*pSendBuf++ = (int)(ctx->share_id);
@@ -3078,7 +3078,7 @@ int __glXQueryContextInfoEXT(__GLXclientState *cl, GLbyte *pc)
WriteToClient(client, sz_xGLXQueryContextInfoEXTReply, (char *)&reply);
WriteToClient(client, nReplyBytes, (char *)sendBuf);
}
- xfree((char *)sendBuf);
+ free((char *)sendBuf);
return Success;
}
@@ -3124,14 +3124,14 @@ int __glXCreatePbuffer(__GLXclientState *cl, GLbyte *pc)
/*
** Create the GLX part of the Pbuffer.
*/
- pGlxPbuffer = (__glXPbuffer *) xalloc(sizeof(__glXPbuffer));
+ pGlxPbuffer = (__glXPbuffer *) malloc(sizeof(__glXPbuffer));
if (!pGlxPbuffer) {
return BadAlloc;
}
- pGlxPbuffer->be_xids = (XID *) xalloc( sizeof(XID) * screenInfo.numScreens );
+ pGlxPbuffer->be_xids = (XID *) malloc( sizeof(XID) * screenInfo.numScreens );
if (!pGlxPbuffer->be_xids) {
- xfree(pGlxPbuffer);
+ free(pGlxPbuffer);
return BadAlloc;
}
@@ -3380,7 +3380,7 @@ int __glXGetDrawableAttributes(__GLXclientState *cl, GLbyte *pc)
if (reply.numAttribs) {
attribs_size = 2 * reply.numAttribs * __GLX_SIZE_CARD32;
- attribs = (CARD32 *) Xalloc(attribs_size);
+ attribs = (CARD32 *) malloc(attribs_size);
if (attribs == NULL) {
UnlockDisplay(dpy);
SyncHandle();
diff --git a/hw/dmx/glxProxy/glxext.c b/hw/dmx/glxProxy/glxext.c
index 6cd8bb41a..4adfbff88 100644
--- a/hw/dmx/glxProxy/glxext.c
+++ b/hw/dmx/glxProxy/glxext.c
@@ -191,7 +191,7 @@ void __glXFreeGLXWindow(__glXWindow *pGlxWindow)
(*pGlxWindow->pScreen->DestroyWindow)(pWindow);
}
- xfree(pGlxWindow);
+ free(pGlxWindow);
}
}
@@ -204,8 +204,8 @@ static void WindowGone(__glXWindow *pGlxWindow, XID id)
void __glXFreeGLXPbuffer(__glXPbuffer *pGlxPbuffer)
{
if (!pGlxPbuffer->idExists && !pGlxPbuffer->refcnt) {
- xfree(pGlxPbuffer->be_xids);
- xfree(pGlxPbuffer);
+ free(pGlxPbuffer->be_xids);
+ free(pGlxPbuffer);
}
}
diff --git a/hw/dmx/glxProxy/glxscreens.c b/hw/dmx/glxProxy/glxscreens.c
index 39978a74d..7be7ac485 100644
--- a/hw/dmx/glxProxy/glxscreens.c
+++ b/hw/dmx/glxProxy/glxscreens.c
@@ -135,7 +135,7 @@ static void CalcServerVersionAndExtensions( void )
/*
* read extensions strings of all back-end servers
*/
- be_extensions = (char **)Xalloc( __glXNumActiveScreens * sizeof(char *) );
+ be_extensions = (char **)malloc( __glXNumActiveScreens * sizeof(char *) );
if (!be_extensions)
return;
@@ -158,7 +158,7 @@ static void CalcServerVersionAndExtensions( void )
length = (int)reply.length;
numbytes = (int)reply.n;
slop = numbytes * __GLX_SIZE_INT8 & 3;
- be_extensions[s] = (char *)Xalloc(numbytes);
+ be_extensions[s] = (char *)malloc(numbytes);
if (!be_extensions[s]) {
/* Throw data on the floor */
_XEatData(dpy, length);
@@ -244,7 +244,7 @@ void __glXScreenInit(GLint numscreens)
// find the set of FBConfigs that are present on all back-end
// servers - only those configs will be supported
*/
- __glXFBConfigs = (__GLXFBConfig **)Xalloc( dmxScreen0->numFBConfigs *
+ __glXFBConfigs = (__GLXFBConfig **)malloc( dmxScreen0->numFBConfigs *
(numscreens+1) * sizeof(__GLXFBConfig *) );
__glXNumFBConfigs = 0;
@@ -282,7 +282,7 @@ void __glXScreenInit(GLint numscreens)
__glXFBConfigs[ __glXNumFBConfigs * (numscreens+1) + 1 ] =
&dmxScreen0->fbconfigs[c];
- proxy_cfg = Xalloc( sizeof(__GLXFBConfig) );
+ proxy_cfg = malloc( sizeof(__GLXFBConfig) );
memcpy( proxy_cfg, cfg, sizeof(__GLXFBConfig) );
proxy_cfg->id = FakeClientID(0);
/* visual will be associated later in __glXGetFBConfigs */
diff --git a/hw/dmx/glxProxy/glxsingle.c b/hw/dmx/glxProxy/glxsingle.c
index dcc604052..8c7fdfc0e 100644
--- a/hw/dmx/glxProxy/glxsingle.c
+++ b/hw/dmx/glxProxy/glxsingle.c
@@ -254,7 +254,7 @@ int __glXForwardPipe0WithReply( __GLXclientState *cl, GLbyte *pc )
_XReply(dpy, (xReply*) &be_reply, 0, False);
be_buf_size = be_reply.length << 2;
if (be_buf_size > 0) {
- be_buf = (char *)Xalloc( be_buf_size );
+ be_buf = (char *)malloc( be_buf_size );
if (be_buf) {
_XRead(dpy, be_buf, be_buf_size);
}
@@ -349,7 +349,7 @@ int __glXForwardAllWithReply( __GLXclientState *cl, GLbyte *pc )
_XReply(dpy, (xReply*) &be_reply, 0, False);
be_buf_size = be_reply.length << 2;
if (be_buf_size > 0) {
- be_buf = (char *)Xalloc( be_buf_size );
+ be_buf = (char *)malloc( be_buf_size );
if (be_buf) {
_XRead(dpy, be_buf, be_buf_size);
}
@@ -801,7 +801,7 @@ int __glXDisp_ReadPixels(__GLXclientState *cl, GLbyte *pc)
buf_size = __glReadPixels_size(format,type,width,height, &ebits, &rowsize);
if (buf_size > 0) {
- buf = (char *) Xalloc( buf_size );
+ buf = (char *) malloc( buf_size );
if ( !buf ) {
return( BadAlloc );
}
@@ -880,7 +880,7 @@ int __glXDisp_ReadPixels(__GLXclientState *cl, GLbyte *pc)
char *be_buf;
int be_buf_size = be_reply.length << 2;
- be_buf = (char *) Xalloc( be_buf_size );
+ be_buf = (char *) malloc( be_buf_size );
if (be_buf) {
_XRead(dpy, be_buf, be_buf_size);
diff --git a/hw/dmx/glxProxy/glxswap.c b/hw/dmx/glxProxy/glxswap.c
index 1e184f914..6d9b4fc55 100644
--- a/hw/dmx/glxProxy/glxswap.c
+++ b/hw/dmx/glxProxy/glxswap.c
@@ -183,7 +183,7 @@ static SwapGroupPtr CreateSwapEntry(WindowPtr pWin)
SwapGroupPtr pEntry;
/* Allocate new swap group */
- pEntry = xalloc(sizeof(*pEntry));
+ pEntry = malloc(sizeof(*pEntry));
if (!pEntry) return NULL;
/* Initialize swap group */
@@ -223,7 +223,7 @@ static void FreeSwapEntry(SwapGroupPtr pEntry)
/* We can free the pEntry entry since it has already been removed
* from the swap group list and it won't be needed any longer */
- xfree(pEntry);
+ free(pEntry);
}
int JoinSwapGroupSGIX(DrawablePtr pDraw, DrawablePtr pMember)
@@ -407,7 +407,7 @@ void SwapBarrierReset(void)
pBarrier;
pBarrier = pNextBarrier) {
pNextBarrier = pBarrier->pNext;
- xfree(pBarrier);
+ free(pBarrier);
}
SwapBarrierList[i] = NULL;
}
@@ -422,7 +422,7 @@ static Bool BindSwapGroupToBarrier(GLuint barrier, SwapGroupPtr pSwapGroup)
{
SwapBarrierPtr pBarrier;
- pBarrier = xalloc(sizeof(*pBarrier));
+ pBarrier = malloc(sizeof(*pBarrier));
if (!pBarrier) return FALSE;
/* Add the swap group to barrier's list */
@@ -448,7 +448,7 @@ static Bool UnbindSwapGroupFromBarrier(GLuint barrier, SwapGroupPtr pSwapGroup)
else SwapBarrierList[barrier] = pBarrier->pNext;
/* Free memory */
- xfree(pBarrier);
+ free(pBarrier);
return TRUE;
}
diff --git a/hw/dmx/glxProxy/glxutil.c b/hw/dmx/glxProxy/glxutil.c
index d0ce50486..cfd026979 100644
--- a/hw/dmx/glxProxy/glxutil.c
+++ b/hw/dmx/glxProxy/glxutil.c
@@ -83,7 +83,7 @@ __glXRealloc(void *addr, size_t newSize)
if (addr) {
if (newSize == 0) {
- xfree(addr);
+ free(addr);
return NULL;
} else {
newAddr = realloc(addr, newSize);
diff --git a/hw/dmx/glxProxy/glxvendor.c b/hw/dmx/glxProxy/glxvendor.c
index 6b1f9a820..6af53e230 100644
--- a/hw/dmx/glxProxy/glxvendor.c
+++ b/hw/dmx/glxProxy/glxvendor.c
@@ -242,7 +242,7 @@ int __glXVForwardPipe0WithReply( __GLXclientState *cl, GLbyte *pc )
_XReply(dpy, (xReply*) &be_reply, 0, False);
be_buf_size = be_reply.length << 2;
if (be_buf_size > 0) {
- be_buf = (char *)Xalloc( be_buf_size );
+ be_buf = (char *)malloc( be_buf_size );
if (be_buf) {
_XRead(dpy, be_buf, be_buf_size);
}
@@ -334,7 +334,7 @@ int __glXVForwardAllWithReply( __GLXclientState *cl, GLbyte *pc )
_XReply(dpy, (xReply*) &be_reply, 0, False);
be_buf_size = be_reply.length << 2;
if (be_buf_size > 0) {
- be_buf = (char *)Xalloc( be_buf_size );
+ be_buf = (char *)malloc( be_buf_size );
if (be_buf) {
_XRead(dpy, be_buf, be_buf_size);
}
diff --git a/hw/dmx/glxProxy/glxvisuals.c b/hw/dmx/glxProxy/glxvisuals.c
index 898c6be7b..58151b7f2 100644
--- a/hw/dmx/glxProxy/glxvisuals.c
+++ b/hw/dmx/glxProxy/glxvisuals.c
@@ -532,7 +532,7 @@ Bool glxInitVisuals(int *nvisualp, VisualPtr *visualp,
/* Free the private list created by DDX HW driver */
if (visualPrivates)
- xfree(visualPrivates);
+ free(visualPrivates);
visualPrivates = NULL;
return TRUE;
diff --git a/hw/dmx/glxProxy/unpack.h b/hw/dmx/glxProxy/unpack.h
index 98fa10ee7..880f9aead 100644
--- a/hw/dmx/glxProxy/unpack.h
+++ b/hw/dmx/glxProxy/unpack.h
@@ -82,7 +82,7 @@ extern xGLXSingleReply __glXReply;
if ((size) > sizeof(answerBuffer)) { \
int bump; \
if ((cl)->returnBufSize < (size)+(align)) { \
- (cl)->returnBuf = (GLbyte*)Xrealloc((cl)->returnBuf, \
+ (cl)->returnBuf = (GLbyte*)realloc((cl)->returnBuf, \
(size)+(align)); \
if (!(cl)->returnBuf) { \
return BadAlloc; \
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 16:43:32 +0000