xserver: Branch 'master' - 3 commits

[Adam Jackson]

 Xext/xvdisp.c           |    3 ---
 Xi/xiquerypointer.c     |    4 ++--
 hw/xwayland/Makefile.am |    2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 5c69cb604a144bdced7d066eaca574aa44e8cb36
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Jun 20 12:57:12 2016 -0400

    xinput: Let top-level dispatch generate the error
    
    ... instead of calling SendErrorToClient ourselves.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Daniel Stone <daniels at collabora.com>

diff --git a/Xi/xiquerypointer.c b/Xi/xiquerypointer.c
index b9e2958..c5b0ba7 100644
--- a/Xi/xiquerypointer.c
+++ b/Xi/xiquerypointer.c
@@ -110,8 +110,8 @@ ProcXIQueryPointer(ClientPtr client)
 
     rc = dixLookupWindow(&pWin, stuff->win, client, DixGetAttrAccess);
     if (rc != Success) {
-        SendErrorToClient(client, IReqCode, X_XIQueryPointer, stuff->win, rc);
-        return Success;
+        client->errorValue = stuff->win;
+        return rc;
     }
 
     if (pDev->valuator->motionHintWindow)
commit 2f981c06a5b9b9eab5e8a9b1d0a18281c0d1033f
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Jun 20 12:57:11 2016 -0400

    xv: Remove some dumb calls SendErrorToClient
    
    We already generate errors from the top level when non-Success is
    returned from a dispatch function, so really we were emitting errors
    twice.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Daniel Stone <daniels at collabora.com>

diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index c2d0fc9..8a35b7b 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -949,7 +949,6 @@ ProcXvShmPutImage(ClientPtr client)
 static int
 ProcXvShmPutImage(ClientPtr client)
 {
-    SendErrorToClient(client, XvReqCode, xv_ShmPutImage, 0, BadImplementation);
     return BadImplementation;
 }
 #endif
@@ -1108,7 +1107,6 @@ ProcXvDispatch(ClientPtr client)
     UpdateCurrentTime();
 
     if (stuff->data >= xvNumRequests) {
-        SendErrorToClient(client, XvReqCode, stuff->data, 0, BadRequest);
         return BadRequest;
     }
 
@@ -1429,7 +1427,6 @@ SProcXvDispatch(ClientPtr client)
     UpdateCurrentTime();
 
     if (stuff->data >= xvNumRequests) {
-        SendErrorToClient(client, XvReqCode, stuff->data, 0, BadRequest);
         return BadRequest;
     }
 
commit 0bfa6bf9def43fd14bc79a302b912454e82999b1
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Jun 20 12:57:10 2016 -0400

    xwayland: Fix relinking when dix changes
    
    Without this a change in eg Xext/ wouldn't relink Xwayland, making you
    wonder why your changes didn't have any effect.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Daniel Stone <daniels at collabora.com>

diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
index 0e6a1ea..34fd633 100644
--- a/hw/xwayland/Makefile.am
+++ b/hw/xwayland/Makefile.am
@@ -50,7 +50,7 @@ xwayland-glamor.c : $(nodist_Xwayland_SOURCES)
 glamor_lib = $(top_builddir)/glamor/libglamor.la
 
 Xwayland_LDADD += $(GLAMOR_LIBS) $(GBM_LIBS) -lEGL -lGL
-Xwayland_DEPENDENCIES = $(glamor_lib)
+Xwayland_DEPENDENCIES = $(glamor_lib) $(XWAYLAND_LIBS)
 endif
 
 EXTRA_DIST = drm.xml