Commit 09a8a169 authored by Ian Romanick's avatar Ian Romanick Committed by Keith Packard
Browse files

glx: Implement GLX SetClientInfo2ARB protocol



The protocol is almost identical to SetClientInfoARB.  The only
difference is the GL versions include an extra 4 bytes for the supported
profile.
Signed-off-by: default avatarIan Romanick <ian.d.romanick@intel.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard's avatarKeith Packard <keithp@keithp.com>
parent 16799325
......@@ -29,10 +29,10 @@
#include "glxbyteorder.h"
#include "unpack.h"
int
__glXDisp_SetClientInfoARB(__GLXclientState * cl, GLbyte * pc)
static int
set_client_info(__GLXclientState * cl, xGLXSetClientInfoARBReq * req,
unsigned bytes_per_version)
{
xGLXSetClientInfoARBReq *req = (xGLXSetClientInfoARBReq *) pc;
char *gl_extensions;
char *glx_extensions;
......@@ -40,7 +40,7 @@ __glXDisp_SetClientInfoARB(__GLXclientState * cl, GLbyte * pc)
* sizes specified for the various fields.
*/
const unsigned expected_size = sz_xGLXSetClientInfoARBReq
+ (req->numVersions * 8)
+ (req->numVersions * bytes_per_version)
+ __GLX_PAD(req->numGLExtensionBytes)
+ __GLX_PAD(req->numGLXExtensionBytes);
......@@ -50,7 +50,7 @@ __glXDisp_SetClientInfoARB(__GLXclientState * cl, GLbyte * pc)
/* Verify that the actual length of the GL extension string matches what's
* encoded in protocol packet.
*/
gl_extensions = (char *) (req + 1) + (req->numVersions * 8);
gl_extensions = (char *) (req + 1) + (req->numVersions * bytes_per_version);
if (req->numGLExtensionBytes != 0
&& memchr(gl_extensions, 0,
__GLX_PAD(req->numGLExtensionBytes)) == NULL)
......@@ -71,6 +71,12 @@ __glXDisp_SetClientInfoARB(__GLXclientState * cl, GLbyte * pc)
return 0;
}
int
__glXDisp_SetClientInfoARB(__GLXclientState * cl, GLbyte * pc)
{
return set_client_info(cl, (xGLXSetClientInfoARBReq *) pc, 8);
}
int
__glXDispSwap_SetClientInfoARB(__GLXclientState * cl, GLbyte * pc)
{
......@@ -87,11 +93,18 @@ __glXDispSwap_SetClientInfoARB(__GLXclientState * cl, GLbyte * pc)
int
__glXDisp_SetClientInfo2ARB(__GLXclientState * cl, GLbyte * pc)
{
return BadRequest;
return set_client_info(cl, (xGLXSetClientInfoARBReq *) pc, 12);
}
int
__glXDispSwap_SetClientInfo2ARB(__GLXclientState * cl, GLbyte * pc)
{
return BadRequest;
xGLXSetClientInfoARBReq *req = (xGLXSetClientInfoARBReq *) pc;
req->length = bswap_16(req->length);
req->numVersions = bswap_32(req->numVersions);
req->numGLExtensionBytes = bswap_32(req->numGLExtensionBytes);
req->numGLXExtensionBytes = bswap_32(req->numGLXExtensionBytes);
return __glXDisp_SetClientInfo2ARB(cl, pc);
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment