diff options
| author | Donnie Berkholz <spyderous@gentoo.org> | 2006-03-20 20:10:29 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2006-03-20 20:10:29 +0000 |
| commit | dcc43d57cbe9d2b65384fe9ba2e4e4fbb43cb0a1 (patch) | |
| tree | a7ffb2ef996dd85d37e87ecacb5d166b0234290c | |
| parent | 9509c6799e31e96677b6d07bdf24ea91ddd30020 (diff) | |
Finish glx_ansic.h wrapper changes to make Xvfb and Xnest link again.
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | GL/glx/glxscreens.c | 4 | ||||
| -rw-r--r-- | GL/glx/glxutil.h | 6 | ||||
| -rw-r--r-- | GL/glx/single2.c | 4 | ||||
| -rw-r--r-- | GL/glx/single2swap.c | 4 |
5 files changed, 19 insertions, 12 deletions
@@ -1,3 +1,16 @@ +2006-03-20 Donnie Berkholz <spyderous@gentoo.org> + + reviewed by: Kristian Høgsberg + + * GL/glx/glxscreens.c: (__glXHyperpipeInit), + (__glXSwapBarrierInit): + * GL/glx/glxutil.h: + * GL/glx/single2.c: (__glXDisp_FeedbackBuffer), + (__glXDisp_SelectBuffer): + * GL/glx/single2swap.c: (__glXDispSwap_FeedbackBuffer), + (__glXDispSwap_SelectBuffer): + Finish glx_ansic.h wrapper changes to make Xvfb and Xnest link again. + 2006-03-20 Adam Jackson <ajax@freedesktop.org> * hw/xfree86/common/xf86Init.c: diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c index bf580a1ed..77654d3ab 100644 --- a/GL/glx/glxscreens.c +++ b/GL/glx/glxscreens.c @@ -222,7 +222,7 @@ static Bool PositionWindow(WindowPtr pWin, int x, int y) void __glXHyperpipeInit(int screen, __GLXHyperpipeExtensionFuncs *funcs) { if (__glXNumHyperpipeFuncs < screen + 1) { - __glXHyperpipeFuncs = __glXRealloc(__glXHyperpipeFuncs, + __glXHyperpipeFuncs = xrealloc(__glXHyperpipeFuncs, (screen+1) * sizeof(__GLXHyperpipeExtensionFuncs)); __glXNumHyperpipeFuncs = screen + 1; } @@ -240,7 +240,7 @@ void __glXHyperpipeInit(int screen, __GLXHyperpipeExtensionFuncs *funcs) void __glXSwapBarrierInit(int screen, __GLXSwapBarrierExtensionFuncs *funcs) { if (__glXNumSwapBarrierFuncs < screen + 1) { - __glXSwapBarrierFuncs = __glXRealloc(__glXSwapBarrierFuncs, + __glXSwapBarrierFuncs = xrealloc(__glXSwapBarrierFuncs, (screen+1) * sizeof(__GLXSwapBarrierExtensionFuncs)); __glXNumSwapBarrierFuncs = screen + 1; } diff --git a/GL/glx/glxutil.h b/GL/glx/glxutil.h index 07384bf76..d5cfa20b5 100644 --- a/GL/glx/glxutil.h +++ b/GL/glx/glxutil.h @@ -43,12 +43,6 @@ extern void __glXNop(void); -/* memory management */ -extern void *__glXMalloc(size_t size); -extern void *__glXCalloc(size_t numElements, size_t elementSize); -extern void *__glXRealloc(void *addr, size_t newSize); -extern void __glXFree(void *ptr); - /* relate contexts with drawables */ extern void __glXAssociateContext(__GLXcontext *glxc); extern void __glXDeassociateContext(__GLXcontext *glxc); diff --git a/GL/glx/single2.c b/GL/glx/single2.c index c8e114824..383c8e763 100644 --- a/GL/glx/single2.c +++ b/GL/glx/single2.c @@ -69,7 +69,7 @@ int __glXDisp_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc) size = *(GLsizei *)(pc+0); type = *(GLenum *)(pc+4); if (cx->feedbackBufSize < size) { - cx->feedbackBuf = (GLfloat *) __glXRealloc(cx->feedbackBuf, + cx->feedbackBuf = (GLfloat *) xrealloc(cx->feedbackBuf, (size_t)size * __GLX_SIZE_FLOAT32); if (!cx->feedbackBuf) { @@ -97,7 +97,7 @@ int __glXDisp_SelectBuffer(__GLXclientState *cl, GLbyte *pc) pc += __GLX_SINGLE_HDR_SIZE; size = *(GLsizei *)(pc+0); if (cx->selectBufSize < size) { - cx->selectBuf = (GLuint *) __glXRealloc(cx->selectBuf, + cx->selectBuf = (GLuint *) xrealloc(cx->selectBuf, (size_t) size * __GLX_SIZE_CARD32); if (!cx->selectBuf) { diff --git a/GL/glx/single2swap.c b/GL/glx/single2swap.c index 571cc0a62..d1f56c2c2 100644 --- a/GL/glx/single2swap.c +++ b/GL/glx/single2swap.c @@ -69,7 +69,7 @@ int __glXDispSwap_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc) size = *(GLsizei *)(pc+0); type = *(GLenum *)(pc+4); if (cx->feedbackBufSize < size) { - cx->feedbackBuf = (GLfloat *) __glXRealloc(cx->feedbackBuf, + cx->feedbackBuf = (GLfloat *) xrealloc(cx->feedbackBuf, (size_t) size * __GLX_SIZE_FLOAT32); if (!cx->feedbackBuf) { @@ -100,7 +100,7 @@ int __glXDispSwap_SelectBuffer(__GLXclientState *cl, GLbyte *pc) __GLX_SWAP_INT(pc+0); size = *(GLsizei *)(pc+0); if (cx->selectBufSize < size) { - cx->selectBuf = (GLuint *) __glXRealloc(cx->selectBuf, + cx->selectBuf = (GLuint *) xrealloc(cx->selectBuf, (size_t) size * __GLX_SIZE_CARD32); if (!cx->selectBuf) { |