xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f107bde1e2e8c67eb42d0a5c757c0a1c777b0327
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Wed Jul 31 11:14:37 2019 +0200

    xwayland: Fix build warning without glamor
    
    Building Xwayland without glamor support would raise a warning at build
    time:
    
      xwayland.c: In function ‘xwl_screen_init’:
      xwayland.c:980:10: warning: unused variable ‘use_eglstreams’
        980 |     Bool use_eglstreams = FALSE;
            |          ^~~~~~~~~~~~~~
    
    When building without glamor support, we cannot have EGL Streams support
    either, the two being related. So we do not need to declare the variable
    `use_eglstreams` if glamor is not enabled.
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index fe8b1abdc..2475366e0 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -977,7 +977,9 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv)
     struct xwl_screen *xwl_screen;
     Pixel red_mask, blue_mask, green_mask;
     int ret, bpc, green_bpc, i;
+#ifdef XWL_HAS_GLAMOR
     Bool use_eglstreams = FALSE;
+#endif
 
     xwl_screen = calloc(1, sizeof *xwl_screen);
     if (xwl_screen == NULL)