xserver: Branch 'master'

[Adam Jackson]

 glx/glxcmds.c     |    3 +--
 glx/glxcmdsswap.c |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 3bc32a7f593cbd2747237621135ef5196bc1e15a
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Aug 22 12:19:56 2017 -0400

    glx: Fix error generation for non-reply vendor private requests
    
    Discarding the return value here is just wrong.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index 6a763970d..241abc6a5 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -2376,8 +2376,7 @@ __glXDisp_VendorPrivate(__GLXclientState * cl, GLbyte * pc)
         __glXGetProtocolDecodeFunction(&VendorPriv_dispatch_info,
                                        vendorcode, 0);
     if (proc != NULL) {
-        (*proc) (cl, (GLbyte *) req);
-        return Success;
+        return (*proc) (cl, (GLbyte *) req);
     }
 
     cl->client->errorValue = req->vendorCode;
diff --git a/glx/glxcmdsswap.c b/glx/glxcmdsswap.c
index 44a09e61c..10d84062e 100644
--- a/glx/glxcmdsswap.c
+++ b/glx/glxcmdsswap.c
@@ -873,8 +873,7 @@ __glXDispSwap_VendorPrivate(__GLXclientState * cl, GLbyte * pc)
         __glXGetProtocolDecodeFunction(&VendorPriv_dispatch_info,
                                        vendorcode, 1);
     if (proc != NULL) {
-        (*proc) (cl, (GLbyte *) req);
-        return Success;
+        return (*proc) (cl, (GLbyte *) req);
     }
 
     cl->client->errorValue = req->vendorCode;