frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement ChangeDrawableAttributes so we can support GLX_EVENT_MASK. 

We never need to actually send out the clobber event, so this should be
sufficient for GLX 1.3.
This commit is contained in:
Kristian Høgsberg 2007-08-27 14:43:48 -04:00
parent 695eb8b2e8
commit ccda4b66bd
3 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
GL/glx/glxcmds.c
View File

@ -1385,14 +1385,35 @@ int __glXDisp_DestroyGLXPbufferSGIX(__GLXclientState *cl, GLbyte *pc)
return DoDestroyDrawable(cl, req->pbuffer, GLX_DRAWABLE_PBUFFER); return DoDestroyDrawable(cl, req->pbuffer, GLX_DRAWABLE_PBUFFER);
} }
static int
DoChangeDrawableAttributes(ClientPtr client, XID glxdrawable,
int numAttribs, CARD32 *attribs)
{
__GLXdrawable *pGlxDraw;
int i;
pGlxDraw = LookupIDByType(glxdrawable, __glXDrawableRes);
for (i = 0; i < numAttribs; i++) {
switch(attribs[i * 2]) {
case GLX_EVENT_MASK:
/* All we do is to record the event mask so we can send it
* back when queried. We never actually clobber the
* pbuffers, so we never need to send out the event. */
pGlxDraw->eventMask = attribs[i * 2 + 1];
break;
}
}
return Success;
}
int __glXDisp_ChangeDrawableAttributes(__GLXclientState *cl, GLbyte *pc) int __glXDisp_ChangeDrawableAttributes(__GLXclientState *cl, GLbyte *pc)
{ {
xGLXChangeDrawableAttributesReq *req = xGLXChangeDrawableAttributesReq *req =
(xGLXChangeDrawableAttributesReq *) pc; (xGLXChangeDrawableAttributesReq *) pc;
(void) req; return DoChangeDrawableAttributes(cl->client, req->drawable,
req->numAttribs, (CARD32 *) (req + 1));
return BadRequest;
} }
int __glXDisp_ChangeDrawableAttributesSGIX(__GLXclientState *cl, GLbyte *pc) int __glXDisp_ChangeDrawableAttributesSGIX(__GLXclientState *cl, GLbyte *pc)
@ -1400,9 +1421,8 @@ int __glXDisp_ChangeDrawableAttributesSGIX(__GLXclientState *cl, GLbyte *pc)
xGLXChangeDrawableAttributesSGIXReq *req = xGLXChangeDrawableAttributesSGIXReq *req =
(xGLXChangeDrawableAttributesSGIXReq *)pc; (xGLXChangeDrawableAttributesSGIXReq *)pc;
(void) req; return DoChangeDrawableAttributes(cl->client, req->drawable,
req->numAttribs, (CARD32 *) (req + 1));
return BadRequest;
} }
int __glXDisp_CreateWindow(__GLXclientState *cl, GLbyte *pc) int __glXDisp_CreateWindow(__GLXclientState *cl, GLbyte *pc)
@ -1676,7 +1696,7 @@ DoGetDrawableAttributes(__GLXclientState *cl, XID drawId)
ClientPtr client = cl->client; ClientPtr client = cl->client;
xGLXGetDrawableAttributesReply reply; xGLXGetDrawableAttributesReply reply;
__GLXdrawable *pGlxDraw; __GLXdrawable *pGlxDraw;
CARD32 attributes[4]; CARD32 attributes[6];
int numAttribs, error; int numAttribs, error;
pGlxDraw = __glXGetDrawable(NULL, drawId, client, &error); pGlxDraw = __glXGetDrawable(NULL, drawId, client, &error);
@ -1685,7 +1705,7 @@ DoGetDrawableAttributes(__GLXclientState *cl, XID drawId)
return error; return error;
} }
numAttribs = 2; numAttribs = 3;
reply.length = numAttribs << 1; reply.length = numAttribs << 1;
reply.type = X_Reply; reply.type = X_Reply;
reply.sequenceNumber = client->sequence; reply.sequenceNumber = client->sequence;
@ -1696,6 +1716,8 @@ DoGetDrawableAttributes(__GLXclientState *cl, XID drawId)
GLX_TEXTURE_RECTANGLE_EXT; GLX_TEXTURE_RECTANGLE_EXT;
attributes[2] = GLX_Y_INVERTED_EXT; attributes[2] = GLX_Y_INVERTED_EXT;
attributes[3] = GL_FALSE; attributes[3] = GL_FALSE;
attributes[4] = GLX_EVENT_MASK;
attributes[5] = pGlxDraw->eventMask;
if (client->swapped) { if (client->swapped) {
__glXSwapGetDrawableAttributesReply(client, &reply, attributes); __glXSwapGetDrawableAttributesReply(client, &reply, attributes);

5
GL/glx/glxdrawable.h
View File

@ -95,6 +95,11 @@ struct __GLXdrawable {
int refCount; int refCount;
GLenum target; GLenum target;
/*
** Event mask
*/
unsigned long eventMask;
}; };
#endif /* !__GLX_drawable_h__ */ #endif /* !__GLX_drawable_h__ */

1
GL/glx/glxutil.c
View File

@ -147,6 +147,7 @@ __glXDrawableInit(__GLXdrawable *drawable,
drawable->drawId = drawId; drawable->drawId = drawId;
drawable->refCount = 1; drawable->refCount = 1;
drawable->modes = modes; drawable->modes = modes;
drawable->eventMask = 0;
return GL_TRUE; return GL_TRUE;
} }