[xsrc/trunk]: xsrc/external/mit/xorg-server/dist/glx Undo merge botch, duplic...

[maya <maya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/e9809af0790e
branches:  trunk
changeset: 10088:e9809af0790e
user:      maya <maya%NetBSD.org@localhost>
date:      Thu Jan 10 16:16:31 2019 +0000

description:
Undo merge botch, duplicate length checks

diffstat:

 external/mit/xorg-server/dist/glx/indirect_program.c             |  2 --
 external/mit/xorg-server/dist/glx/indirect_texture_compression.c |  4 ----
 external/mit/xorg-server/dist/glx/singlepix.c                    |  2 --
 external/mit/xorg-server/dist/glx/swap_interval.c                |  2 --
 4 files changed, 0 insertions(+), 10 deletions(-)

diffs (57 lines):

diff -r 03bc2e37c6d5 -r e9809af0790e external/mit/xorg-server/dist/glx/indirect_program.c
--- a/external/mit/xorg-server/dist/glx/indirect_program.c      Thu Jan 10 14:33:11 2019 +0000
+++ b/external/mit/xorg-server/dist/glx/indirect_program.c      Thu Jan 10 16:16:31 2019 +0000
@@ -58,8 +58,6 @@
 
     REQUEST_FIXED_SIZE(xGLXVendorPrivateWithReplyReq, 8);
 
-    REQUEST_FIXED_SIZE(xGLXVendorPrivateWithReplyReq, 8);
-
     pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
         GLenum target;
diff -r 03bc2e37c6d5 -r e9809af0790e external/mit/xorg-server/dist/glx/indirect_texture_compression.c
--- a/external/mit/xorg-server/dist/glx/indirect_texture_compression.c  Thu Jan 10 14:33:11 2019 +0000
+++ b/external/mit/xorg-server/dist/glx/indirect_texture_compression.c  Thu Jan 10 16:16:31 2019 +0000
@@ -45,8 +45,6 @@
 
     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 @@
 
     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));
diff -r 03bc2e37c6d5 -r e9809af0790e external/mit/xorg-server/dist/glx/singlepix.c
--- a/external/mit/xorg-server/dist/glx/singlepix.c     Thu Jan 10 14:33:11 2019 +0000
+++ b/external/mit/xorg-server/dist/glx/singlepix.c     Thu Jan 10 16:16:31 2019 +0000
@@ -105,8 +105,6 @@
 
     REQUEST_FIXED_SIZE(xGLXSingleReq, 20);
 
-    REQUEST_FIXED_SIZE(xGLXSingleReq, 20);
-
     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
     if (!cx) {
         return error;
diff -r 03bc2e37c6d5 -r e9809af0790e external/mit/xorg-server/dist/glx/swap_interval.c
--- a/external/mit/xorg-server/dist/glx/swap_interval.c Thu Jan 10 14:33:11 2019 +0000
+++ b/external/mit/xorg-server/dist/glx/swap_interval.c Thu Jan 10 16:16:31 2019 +0000
@@ -48,8 +48,6 @@
 
     REQUEST_FIXED_SIZE(xGLXVendorPrivateReq, 4);
 
-    REQUEST_FIXED_SIZE(xGLXVendorPrivateReq, 4);
-
     cx = __glXLookupContextByTag(cl, tag);
 
     if ((cx == NULL) || (cx->pGlxScreen == NULL)) {