forked from pool/xorg-x11-server
Stefan Dirsch
53e4fb984b
required for OpenGL 3.0 support (not upstream yet) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=388
103 lines
3.3 KiB
Diff
103 lines
3.3 KiB
Diff
From 975f069a92f8bd85f9d0ce4916f2c1c4a3cea339 Mon Sep 17 00:00:00 2001
|
|
From: Ian Romanick <ian.d.romanick@intel.com>
|
|
Date: Fri, 9 Dec 2011 17:28:21 -0800
|
|
Subject: [PATCH 06/11] glx: Implement GLX SetClientInfoARB protocol
|
|
|
|
v2: Bump glproto version to 1.4.15. This patch uses structure names
|
|
that only exist in that glproto version and later. Noticed by
|
|
Christopher James Halse Rogers.
|
|
|
|
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
|
|
Reviewed-by: Dave Airlie <airlied@redhat.com>
|
|
Reviewed-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
|
|
---
|
|
configure.ac | 2 +-
|
|
glx/clientinfo.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
|
|
2 files changed, 48 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 6a41ea8..de7526f 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -777,7 +777,7 @@ DRI2PROTO="dri2proto >= 2.6"
|
|
XINERAMAPROTO="xineramaproto"
|
|
BIGFONTPROTO="xf86bigfontproto >= 1.2.0"
|
|
DGAPROTO="xf86dgaproto >= 2.0.99.1"
|
|
-GLPROTO="glproto >= 1.4.14"
|
|
+GLPROTO="glproto >= 1.4.15"
|
|
DMXPROTO="dmxproto >= 2.2.99.1"
|
|
VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1"
|
|
WINDOWSWMPROTO="windowswmproto"
|
|
diff --git a/glx/clientinfo.c b/glx/clientinfo.c
|
|
index 15bbf15..b26ac1a 100644
|
|
--- a/glx/clientinfo.c
|
|
+++ b/glx/clientinfo.c
|
|
@@ -26,17 +26,62 @@
|
|
|
|
#include "glxserver.h"
|
|
#include "indirect_dispatch.h"
|
|
+#include "glxbyteorder.h"
|
|
+#include "unpack.h"
|
|
|
|
int
|
|
__glXDisp_SetClientInfoARB(__GLXclientState * cl, GLbyte * pc)
|
|
{
|
|
- return BadRequest;
|
|
+ xGLXSetClientInfoARBReq *req = (xGLXSetClientInfoARBReq *) pc;
|
|
+ char *gl_extensions;
|
|
+ char *glx_extensions;
|
|
+
|
|
+ /* Verify that the size of the packet matches the size inferred from the
|
|
+ * sizes specified for the various fields.
|
|
+ */
|
|
+ const unsigned expected_size = sz_xGLXSetClientInfoARBReq
|
|
+ + (req->numVersions * 8)
|
|
+ + __GLX_PAD(req->numGLExtensionBytes)
|
|
+ + __GLX_PAD(req->numGLXExtensionBytes);
|
|
+
|
|
+ if (req->length != (expected_size / 4))
|
|
+ return BadLength;
|
|
+
|
|
+ /* 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);
|
|
+ if (req->numGLExtensionBytes != 0
|
|
+ && memchr(gl_extensions, 0,
|
|
+ __GLX_PAD(req->numGLExtensionBytes)) == NULL)
|
|
+ return BadLength;
|
|
+
|
|
+ /* Verify that the actual length of the GLX extension string matches
|
|
+ * what's encoded in protocol packet.
|
|
+ */
|
|
+ glx_extensions = gl_extensions + __GLX_PAD(req->numGLExtensionBytes);
|
|
+ if (req->numGLXExtensionBytes != 0
|
|
+ && memchr(glx_extensions, 0,
|
|
+ __GLX_PAD(req->numGLXExtensionBytes)) == NULL)
|
|
+ return BadLength;
|
|
+
|
|
+ free(cl->GLClientextensions);
|
|
+ cl->GLClientextensions = strdup(gl_extensions);
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
int
|
|
__glXDispSwap_SetClientInfoARB(__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_SetClientInfoARB(cl, pc);
|
|
}
|
|
|
|
int
|
|
--
|
|
1.7.3.4
|
|
|