forked from pool/xorg-x11-server
59 lines
1.8 KiB
Diff
59 lines
1.8 KiB
Diff
|
From 2bbacf1fb21b98e8b9481931f131c176a0f78dc5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ian Romanick <ian.d.romanick@intel.com>
|
||
|
|
Date: Fri, 2 Dec 2011 21:14:46 -0800
|
||
|
|
Subject: [PATCH 02/11] glx: Don't track GLClientmajorVersion or GLClientminorVersion
|
||
|
|
|
||
|
|
Nothing uses these fields anywhere in the server.
|
||
|
|
|
||
|
|
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
|
||
|
|
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
|
||
|
|
Reviewed-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
|
||
|
|
---
|
||
|
|
glx/glxcmds.c | 2 --
|
||
|
|
glx/glxext.c | 2 --
|
||
|
|
glx/glxserver.h | 2 --
|
||
|
|
3 files changed, 0 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/glx/glxcmds.c b/glx/glxcmds.c
|
||
|
|
index 6fa10fe..5c70afa 100644
|
||
|
|
--- a/glx/glxcmds.c
|
||
|
|
+++ b/glx/glxcmds.c
|
||
|
|
@@ -2396,8 +2396,6 @@ __glXDisp_ClientInfo(__GLXclientState * cl, GLbyte * pc)
|
||
|
|
if (!memchr(buf, 0, (client->req_len << 2) - sizeof(xGLXClientInfoReq)))
|
||
|
|
return BadLength;
|
||
|
|
|
||
|
|
- cl->GLClientmajorVersion = req->major;
|
||
|
|
- cl->GLClientminorVersion = req->minor;
|
||
|
|
free(cl->GLClientextensions);
|
||
|
|
cl->GLClientextensions = strdup(buf);
|
||
|
|
|
||
|
|
diff --git a/glx/glxext.c b/glx/glxext.c
|
||
|
|
index acd696e..599f029 100644
|
||
|
|
--- a/glx/glxext.c
|
||
|
|
+++ b/glx/glxext.c
|
||
|
|
@@ -281,8 +281,6 @@ glxClientCallback(CallbackListPtr *list, pointer closure, pointer data)
|
||
|
|
** By default, assume that the client supports
|
||
|
|
** GLX major version 1 minor version 0 protocol.
|
||
|
|
*/
|
||
|
|
- cl->GLClientmajorVersion = 1;
|
||
|
|
- cl->GLClientminorVersion = 0;
|
||
|
|
cl->client = pClient;
|
||
|
|
break;
|
||
|
|
|
||
|
|
diff --git a/glx/glxserver.h b/glx/glxserver.h
|
||
|
|
index 7076848..87c94d9 100644
|
||
|
|
--- a/glx/glxserver.h
|
||
|
|
+++ b/glx/glxserver.h
|
||
|
|
@@ -145,8 +145,6 @@ struct __GLXclientStateRec {
|
||
|
|
/* Back pointer to X client record */
|
||
|
|
ClientPtr client;
|
||
|
|
|
||
|
|
- int GLClientmajorVersion;
|
||
|
|
- int GLClientminorVersion;
|
||
|
|
char *GLClientextensions;
|
||
|
|
};
|
||
|
|
|
||
|
|
--
|
||
|
|
1.7.3.4
|
||
|
|
|