Module Name: xsrc
Committed By: maya
Date: Thu Jan 10 16:16:31 UTC 2019
Modified Files:
xsrc/external/mit/xorg-server/dist/glx: indirect_program.c
indirect_texture_compression.c singlepix.c swap_interval.c
Log Message:
Undo merge botch, duplicate length checks
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/glx/indirect_program.c \
xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c \
xsrc/external/mit/xorg-server/dist/glx/singlepix.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server/dist/glx/swap_interval.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/glx/indirect_program.c
diff -u xsrc/external/mit/xorg-server/dist/glx/indirect_program.c:1.4 xsrc/external/mit/xorg-server/dist/glx/indirect_program.c:1.5
--- xsrc/external/mit/xorg-server/dist/glx/indirect_program.c:1.4 Mon Dec 31 09:49:59 2018
+++ xsrc/external/mit/xorg-server/dist/glx/indirect_program.c Thu Jan 10 16:16:31 2019
@@ -58,8 +58,6 @@ DoGetProgramString(struct __GLXclientSta
REQUEST_FIXED_SIZE(xGLXVendorPrivateWithReplyReq, 8);
- REQUEST_FIXED_SIZE(xGLXVendorPrivateWithReplyReq, 8);
-
pc += __GLX_VENDPRIV_HDR_SIZE;
if (cx != NULL) {
GLenum target;
Index: xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c
diff -u xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c:1.4 xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c:1.5
--- xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c:1.4 Mon Dec 31 09:49:59 2018
+++ xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c Thu Jan 10 16:16:31 2019
@@ -45,8 +45,6 @@ __glXDisp_GetCompressedTexImage(struct _
REQUEST_FIXED_SIZE(xGLXSingleReq, 8);
- REQUEST_FIXED_SIZE(xGLXSingleReq, 8);
-
pc += __GLX_SINGLE_HDR_SIZE;
if (cx != NULL) {
const GLenum target = *(GLenum *) (pc + 0);
@@ -94,8 +92,6 @@ __glXDispSwap_GetCompressedTexImage(stru
REQUEST_FIXED_SIZE(xGLXSingleReq, 8);
- REQUEST_FIXED_SIZE(xGLXSingleReq, 8);
-
pc += __GLX_SINGLE_HDR_SIZE;
if (cx != NULL) {
const GLenum target = (GLenum) bswap_32(*(int *) (pc + 0));
Index: xsrc/external/mit/xorg-server/dist/glx/singlepix.c
diff -u xsrc/external/mit/xorg-server/dist/glx/singlepix.c:1.4 xsrc/external/mit/xorg-server/dist/glx/singlepix.c:1.5
--- xsrc/external/mit/xorg-server/dist/glx/singlepix.c:1.4 Mon Dec 31 09:49:59 2018
+++ xsrc/external/mit/xorg-server/dist/glx/singlepix.c Thu Jan 10 16:16:31 2019
@@ -105,8 +105,6 @@ __glXDisp_GetTexImage(__GLXclientState *
REQUEST_FIXED_SIZE(xGLXSingleReq, 20);
- REQUEST_FIXED_SIZE(xGLXSingleReq, 20);
-
cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
if (!cx) {
return error;
Index: xsrc/external/mit/xorg-server/dist/glx/swap_interval.c
diff -u xsrc/external/mit/xorg-server/dist/glx/swap_interval.c:1.3 xsrc/external/mit/xorg-server/dist/glx/swap_interval.c:1.4
--- xsrc/external/mit/xorg-server/dist/glx/swap_interval.c:1.3 Thu Aug 11 00:04:27 2016
+++ xsrc/external/mit/xorg-server/dist/glx/swap_interval.c Thu Jan 10 16:16:31 2019
@@ -48,8 +48,6 @@ DoSwapInterval(__GLXclientState * cl, GL
REQUEST_FIXED_SIZE(xGLXVendorPrivateReq, 4);
- REQUEST_FIXED_SIZE(xGLXVendorPrivateReq, 4);
-
cx = __glXLookupContextByTag(cl, tag);
if ((cx == NULL) || (cx->pGlxScreen == NULL)) {
