aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/dmx/glxProxy/glxcmds.c
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/hw/dmx/glxProxy/glxcmds.c')
-rw-r--r--xorg-server/hw/dmx/glxProxy/glxcmds.c86
1 files changed, 43 insertions, 43 deletions
diff --git a/xorg-server/hw/dmx/glxProxy/glxcmds.c b/xorg-server/hw/dmx/glxProxy/glxcmds.c
index 190eeefe2..964db4069 100644
--- a/xorg-server/hw/dmx/glxProxy/glxcmds.c
+++ b/xorg-server/hw/dmx/glxProxy/glxcmds.c
@@ -195,7 +195,7 @@ CreateContext(__GLXclientState * cl,
shareglxc = NULL;
}
else {
- dixLookupResourceByType((pointer *) &shareglxc, shareList,
+ dixLookupResourceByType((void **) &shareglxc, shareList,
__glXContextRes, NullClient, DixUnknownAccess);
if (!shareglxc) {
client->errorValue = shareList;
@@ -425,7 +425,7 @@ CreateContext(__GLXclientState * cl,
/*
** Register this context as a resource.
*/
- if (!AddResource(gcId, __glXContextRes, (pointer) glxc)) {
+ if (!AddResource(gcId, __glXContextRes, (void *) glxc)) {
free(glxc->real_ids);
free(glxc->real_vids);
free(glxc);
@@ -511,14 +511,14 @@ __glXBindSwapBarrierSGIX(__GLXclientState * cl, GLbyte * pc)
rc = dixLookupDrawable(&pDraw, req->drawable, client, 0, DixGetAttrAccess);
if (rc != Success) {
- dixLookupResourceByType((pointer *) &pGlxPixmap, req->drawable,
+ dixLookupResourceByType((void **) &pGlxPixmap, req->drawable,
__glXPixmapRes, NullClient, DixUnknownAccess);
if (pGlxPixmap)
pDraw = pGlxPixmap->pDraw;
}
if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
- dixLookupResourceByType((pointer *) &pGlxWindow, req->drawable,
+ dixLookupResourceByType((void **) &pGlxWindow, req->drawable,
__glXWindowRes, NullClient, DixUnknownAccess);
if (pGlxWindow)
pDraw = pGlxWindow->pDraw;
@@ -544,14 +544,14 @@ __glXJoinSwapGroupSGIX(__GLXclientState * cl, GLbyte * pc)
rc = dixLookupDrawable(&pDraw, req->drawable, client, 0, DixManageAccess);
if (rc != Success) {
- dixLookupResourceByType((pointer *) &pGlxPixmap, req->drawable,
+ dixLookupResourceByType((void **) &pGlxPixmap, req->drawable,
__glXPixmapRes, NullClient, DixUnknownAccess);
if (pGlxPixmap)
pDraw = pGlxPixmap->pDraw;
}
if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
- dixLookupResourceByType((pointer *) &pGlxWindow, req->drawable,
+ dixLookupResourceByType((void **) &pGlxWindow, req->drawable,
__glXWindowRes, NullClient, DixUnknownAccess);
if (pGlxWindow)
pDraw = pGlxWindow->pDraw;
@@ -566,7 +566,7 @@ __glXJoinSwapGroupSGIX(__GLXclientState * cl, GLbyte * pc)
rc = dixLookupDrawable(&pMember, req->member, client, 0,
DixGetAttrAccess);
if (rc != Success) {
- dixLookupResourceByType((pointer *) &pGlxPixmap, req->member,
+ dixLookupResourceByType((void **) &pGlxPixmap, req->member,
__glXPixmapRes, NullClient,
DixUnknownAccess);
if (pGlxPixmap)
@@ -574,7 +574,7 @@ __glXJoinSwapGroupSGIX(__GLXclientState * cl, GLbyte * pc)
}
if (!pMember && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
- dixLookupResourceByType((pointer *) &pGlxWindow, req->member,
+ dixLookupResourceByType((void **) &pGlxWindow, req->member,
__glXWindowRes, NullClient,
DixUnknownAccess);
if (pGlxWindow)
@@ -605,7 +605,7 @@ __glXDestroyContext(__GLXclientState * cl, GLbyte * pc)
int to_screen = 0;
int s;
- dixLookupResourceByType((pointer *) &glxc, gcId, __glXContextRes,
+ dixLookupResourceByType((void **) &glxc, gcId, __glXContextRes,
NullClient, DixUnknownAccess);
if (glxc) {
/*
@@ -880,7 +880,7 @@ MakeCurrent(__GLXclientState * cl,
** Lookup new context. It must not be current for someone else.
*/
if (contextId != None) {
- dixLookupResourceByType((pointer *) &glxc, contextId, __glXContextRes,
+ dixLookupResourceByType((void **) &glxc, contextId, __glXContextRes,
NullClient, DixUnknownAccess);
if (!glxc) {
client->errorValue = contextId;
@@ -935,7 +935,7 @@ MakeCurrent(__GLXclientState * cl,
}
if (!pDraw) {
- dixLookupResourceByType((pointer *) &pGlxPixmap, drawId,
+ dixLookupResourceByType((void **) &pGlxPixmap, drawId,
__glXPixmapRes, NullClient,
DixUnknownAccess);
if (pGlxPixmap) {
@@ -960,7 +960,7 @@ MakeCurrent(__GLXclientState * cl,
}
if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
- dixLookupResourceByType((pointer *) &pGlxWindow, drawId,
+ dixLookupResourceByType((void **) &pGlxWindow, drawId,
__glXWindowRes, NullClient,
DixUnknownAccess);
if (pGlxWindow) {
@@ -983,7 +983,7 @@ MakeCurrent(__GLXclientState * cl,
}
if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
- dixLookupResourceByType((pointer *) &pGlxPbuffer, drawId,
+ dixLookupResourceByType((void **) &pGlxPbuffer, drawId,
__glXPbufferRes, NullClient,
DixUnknownAccess);
if (pGlxPbuffer) {
@@ -1050,7 +1050,7 @@ MakeCurrent(__GLXclientState * cl,
}
if (!pReadDraw) {
- dixLookupResourceByType((pointer *) &pReadGlxPixmap, readId,
+ dixLookupResourceByType((void **) &pReadGlxPixmap, readId,
__glXPixmapRes, NullClient,
DixUnknownAccess);
if (pReadGlxPixmap) {
@@ -1072,7 +1072,7 @@ MakeCurrent(__GLXclientState * cl,
}
if (!pReadDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
- dixLookupResourceByType((pointer *) &pGlxReadWindow, readId,
+ dixLookupResourceByType((void **) &pGlxReadWindow, readId,
__glXWindowRes, NullClient,
DixUnknownAccess);
if (pGlxReadWindow) {
@@ -1094,7 +1094,7 @@ MakeCurrent(__GLXclientState * cl,
}
if (!pReadDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
- dixLookupResourceByType((pointer *) &pGlxReadPbuffer, readId,
+ dixLookupResourceByType((void **) &pGlxReadPbuffer, readId,
__glXPbufferRes, NullClient,
DixUnknownAccess);
if (pGlxReadPbuffer) {
@@ -1236,14 +1236,14 @@ MakeCurrent(__GLXclientState * cl,
to_screen = screenInfo.numScreens - 1;
if (pDraw && new_reply.writeType != GLX_PBUFFER_TYPE) {
- dixLookupResourceByClass((pointer *) &pXinDraw,
+ dixLookupResourceByClass((void **) &pXinDraw,
pDraw->id, XRC_DRAWABLE,
client, DixReadAccess);
}
if (pReadDraw && pReadDraw != pDraw &&
new_reply.readType != GLX_PBUFFER_TYPE) {
- dixLookupResourceByClass((pointer *) &pXinReadDraw,
+ dixLookupResourceByClass((void **) &pXinReadDraw,
pReadDraw->id, XRC_DRAWABLE,
client, DixReadAccess);
}
@@ -1460,7 +1460,7 @@ __glXIsDirect(__GLXclientState * cl, GLbyte * pc)
/*
** Find the GL context.
*/
- dixLookupResourceByType((pointer *) &glxc, req->context, __glXContextRes,
+ dixLookupResourceByType((void **) &glxc, req->context, __glXContextRes,
NullClient, DixUnknownAccess);
if (!glxc) {
client->errorValue = req->context;
@@ -1619,13 +1619,13 @@ __glXCopyContext(__GLXclientState * cl, GLbyte * pc)
/*
** Check that each context exists.
*/
- dixLookupResourceByType((pointer *) &src, source, __glXContextRes,
+ dixLookupResourceByType((void **) &src, source, __glXContextRes,
NullClient, DixUnknownAccess);
if (!src) {
client->errorValue = source;
return __glXBadContext;
}
- dixLookupResourceByType((pointer *) &dst, dest, __glXContextRes,
+ dixLookupResourceByType((void **) &dst, dest, __glXContextRes,
NullClient, DixUnknownAccess);
if (!dst) {
client->errorValue = dest;
@@ -1925,7 +1925,7 @@ CreateGLXPixmap(__GLXclientState * cl,
from_screen = 0;
to_screen = screenInfo.numScreens - 1;
- dixLookupResourceByClass((pointer *) &pXinDraw,
+ dixLookupResourceByClass((void **) &pXinDraw,
pDraw->id, XRC_DRAWABLE,
client, DixReadAccess);
}
@@ -2055,7 +2055,7 @@ __glXDestroyGLXPixmap(__GLXclientState * cl, GLbyte * pc)
/*
** Check if it's a valid GLX pixmap.
*/
- dixLookupResourceByType((pointer *) &pGlxPixmap, glxpixmap,
+ dixLookupResourceByType((void **) &pGlxPixmap, glxpixmap,
__glXPixmapRes, NullClient, DixUnknownAccess);
if (!pGlxPixmap) {
client->errorValue = glxpixmap;
@@ -2141,7 +2141,7 @@ __glXDoSwapBuffers(__GLXclientState * cl, XID drawId, GLXContextTag tag)
}
if (!pDraw) {
- dixLookupResourceByType((pointer *) &pGlxPixmap, drawId,
+ dixLookupResourceByType((void **) &pGlxPixmap, drawId,
__glXPixmapRes, NullClient, DixUnknownAccess);
if (pGlxPixmap) {
/*
@@ -2153,7 +2153,7 @@ __glXDoSwapBuffers(__GLXclientState * cl, XID drawId, GLXContextTag tag)
}
if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
- dixLookupResourceByType((pointer *) &pGlxWindow, drawId,
+ dixLookupResourceByType((void **) &pGlxWindow, drawId,
__glXWindowRes, NullClient, DixUnknownAccess);
if (pGlxWindow) {
/*
@@ -2183,7 +2183,7 @@ __glXDoSwapBuffers(__GLXclientState * cl, XID drawId, GLXContextTag tag)
if (!noPanoramiXExtension) {
from_screen = 0;
to_screen = screenInfo.numScreens - 1;
- dixLookupResourceByClass((pointer *) &pXinDraw,
+ dixLookupResourceByClass((void **) &pXinDraw,
pDraw->id, XRC_DRAWABLE,
client, DixReadAccess);
}
@@ -2291,7 +2291,7 @@ __glXSwapBuffers(__GLXclientState * cl, GLbyte * pc)
}
if (!pDraw) {
- dixLookupResourceByType((pointer *) &pGlxPixmap, drawId,
+ dixLookupResourceByType((void **) &pGlxPixmap, drawId,
__glXPixmapRes, NullClient, DixUnknownAccess);
if (pGlxPixmap) {
/*
@@ -2302,7 +2302,7 @@ __glXSwapBuffers(__GLXclientState * cl, GLbyte * pc)
}
if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
- dixLookupResourceByType((pointer *) &pGlxWindow, drawId,
+ dixLookupResourceByType((void **) &pGlxWindow, drawId,
__glXWindowRes, NullClient, DixUnknownAccess);
if (pGlxWindow) {
/*
@@ -2817,12 +2817,12 @@ __glXUseXFont(__GLXclientState * cl, GLbyte * pc)
** Font can actually be either the ID of a font or the ID of a GC
** containing a font.
*/
- dixLookupResourceByType((pointer *) &pFont, req->font, RT_FONT,
+ dixLookupResourceByType((void **) &pFont, req->font, RT_FONT,
NullClient, DixUnknownAccess);
if (!pFont) {
GC *pGC;
- dixLookupResourceByType((pointer *) &pGC, req->font,
+ dixLookupResourceByType((void **) &pGC, req->font,
RT_GC, NullClient, DixUnknownAccess);
if (!pGC) {
client->errorValue = req->font;
@@ -3082,7 +3082,7 @@ __glXCreateWindow(__GLXclientState * cl, GLbyte * pc)
VisualPtr pVisual;
VisualID visId;
int i, rc;
- pointer val;
+ void *val;
/*
** Check if windowId is valid
@@ -3184,7 +3184,7 @@ __glXDestroyWindow(__GLXclientState * cl, GLbyte * pc)
ClientPtr client = cl->client;
xGLXDestroyWindowReq *req = (xGLXDestroyWindowReq *) pc;
XID glxwindow = req->glxwindow;
- pointer val;
+ void *val;
/*
** Check if it's a valid GLX window.
@@ -3216,7 +3216,7 @@ __glXQueryContext(__GLXclientState * cl, GLbyte * pc)
int nReplyBytes;
req = (xGLXQueryContextReq *) pc;
- dixLookupResourceByType((pointer *) &ctx, req->context, __glXContextRes,
+ dixLookupResourceByType((void **) &ctx, req->context, __glXContextRes,
NullClient, DixUnknownAccess);
if (!ctx) {
client->errorValue = req->context;
@@ -3266,7 +3266,7 @@ __glXQueryContextInfoEXT(__GLXclientState * cl, GLbyte * pc)
int nReplyBytes;
req = (xGLXQueryContextInfoEXTReq *) pc;
- dixLookupResourceByType((pointer *) &ctx,
+ dixLookupResourceByType((void **) &ctx,
req->context, __glXContextRes,
client, DixReadAccess);
@@ -3439,7 +3439,7 @@ __glXDestroyPbuffer(__GLXclientState * cl, GLbyte * pc)
/*
** Check if it's a valid Pbuffer
*/
- dixLookupResourceByType((pointer *) &pGlxPbuffer, pbuffer,
+ dixLookupResourceByType((void **) &pGlxPbuffer, pbuffer,
__glXPbufferRes, NullClient, DixUnknownAccess);
if (!pGlxPbuffer) {
client->errorValue = pbuffer;
@@ -3514,7 +3514,7 @@ __glXGetDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
if (!pDraw) {
__GLXpixmap *pGlxPixmap;
- dixLookupResourceByType((pointer *) &pGlxPixmap,
+ dixLookupResourceByType((void **) &pGlxPixmap,
drawId, __glXPixmapRes,
NullClient, DixUnknownAccess);
if (pGlxPixmap) {
@@ -3527,7 +3527,7 @@ __glXGetDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
if (!pDraw) {
__glXWindow *pGlxWindow;
- dixLookupResourceByType((pointer *) &pGlxWindow,
+ dixLookupResourceByType((void **) &pGlxWindow,
drawId, __glXWindowRes,
NullClient, DixUnknownAccess);
if (pGlxWindow) {
@@ -3540,7 +3540,7 @@ __glXGetDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
if (!pDraw) {
__glXPbuffer *pGlxPbuffer;
- dixLookupResourceByType((pointer *) &pGlxPbuffer,
+ dixLookupResourceByType((void **) &pGlxPbuffer,
drawId, __glXPbufferRes,
NullClient, DixUnknownAccess);
if (pGlxPbuffer) {
@@ -3567,7 +3567,7 @@ __glXGetDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
#ifdef PANORAMIX
if (!noPanoramiXExtension) {
- if (Success != dixLookupResourceByClass((pointer *) &pXinDraw,
+ if (Success != dixLookupResourceByClass((void **) &pXinDraw,
pDraw->id, XRC_DRAWABLE,
client, DixReadAccess)) {
client->errorValue = drawId;
@@ -3676,7 +3676,7 @@ __glXChangeDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
if (!pDraw) {
__GLXpixmap *pGlxPixmap;
- dixLookupResourceByType((pointer *) &pGlxPixmap,
+ dixLookupResourceByType((void **) &pGlxPixmap,
drawId, __glXPixmapRes,
NullClient, DixUnknownAccess);
if (pGlxPixmap) {
@@ -3689,7 +3689,7 @@ __glXChangeDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
if (!pDraw) {
__glXWindow *pGlxWindow;
- dixLookupResourceByType((pointer *) &pGlxWindow,
+ dixLookupResourceByType((void **) &pGlxWindow,
drawId, __glXWindowRes,
NullClient, DixUnknownAccess);
if (pGlxWindow) {
@@ -3702,7 +3702,7 @@ __glXChangeDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
if (!pDraw) {
__glXPbuffer *pGlxPbuffer;
- dixLookupResourceByType((pointer *) &pGlxPbuffer,
+ dixLookupResourceByType((void **) &pGlxPbuffer,
drawId, __glXPbufferRes,
NullClient, DixUnknownAccess);
if (pGlxPbuffer) {
@@ -3731,7 +3731,7 @@ __glXChangeDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
if (!noPanoramiXExtension) {
PanoramiXRes *pXinDraw;
- if (Success != dixLookupResourceByClass((pointer *) &pXinDraw,
+ if (Success != dixLookupResourceByClass((void **) &pXinDraw,
pDraw->id, XRC_DRAWABLE,
client, DixReadAccess)) {
client->errorValue = drawId;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 05:30:37 +0000