From 0d76191baeee005982754ac18ca995742e32d8c1 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 9 Nov 2012 17:10:57 -0500 Subject: [PATCH] glx: Implement GLX_{WIDTH,HEIGHT} in GetDrawableAttributes Required by GLX 1.4, section 3.3.6, "Querying Attributes". Reviewed-by: Eric Anholt Signed-off-by: Adam Jackson --- glx/glxcmds.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/glx/glxcmds.c b/glx/glxcmds.c index cecbf7bd3..4a343a6ff 100644 --- a/glx/glxcmds.c +++ b/glx/glxcmds.c @@ -1892,7 +1892,7 @@ DoGetDrawableAttributes(__GLXclientState * cl, XID drawId) ClientPtr client = cl->client; xGLXGetDrawableAttributesReply reply; __GLXdrawable *pGlxDraw; - CARD32 attributes[6]; + CARD32 attributes[10]; int numAttribs = 0, error; if (!validGlxDrawable(client, drawId, GLX_DRAWABLE_ANY, @@ -1909,6 +1909,12 @@ DoGetDrawableAttributes(__GLXclientState * cl, XID drawId) attributes[4] = GLX_EVENT_MASK; attributes[5] = pGlxDraw->eventMask; numAttribs++; + attributes[6] = GLX_WIDTH; + attributes[7] = pGlxDraw->pDraw->width; + numAttribs++; + attributes[8] = GLX_HEIGHT; + attributes[9] = pGlxDraw->pDraw->height; + numAttribs++; reply = (xGLXGetDrawableAttributesReply) { .type = X_Reply,