1. 17 Jul, 2019 3 commits
  2. 16 Jul, 2019 1 commit
  3. 15 Jul, 2019 1 commit
  4. 12 Jul, 2019 1 commit
  5. 10 Jul, 2019 2 commits
  6. 03 Jul, 2019 1 commit
  7. 01 Jul, 2019 2 commits
  8. 28 Jun, 2019 6 commits
  9. 20 Jun, 2019 2 commits
    • Adam Jackson's avatar
      present: Require presentproto 1.2 · e39dc0f5
      Adam Jackson authored
      The PresentOptionSuboptimal support code is not optional (once you've
      enabled building Present at all), so require a protocol package version
      that defines what we need.
      
      Fixes: #821
      e39dc0f5
    • Adam Jackson's avatar
      linux: Fix platform device PCI detection for complex bus topologies · 9acff309
      Adam Jackson authored
      Suppose you're in a Hyper-V guest and are trying to use PCI passthrough.
      The ID_PATH that udev will construct for that looks something like
      "acpi-VMBUS:00-pci-b8c8:00:00.0", and obviously looking for "pci-" in
      the first four characters of that is going to not work.
      
      Instead, strstr. I suppose it's possible you could have _multiple_ PCI
      buses in the path, in which case you'd want strrstr, if that were a
      thing.
      9acff309
  10. 19 Jun, 2019 2 commits
    • Olivier Fourdan's avatar
      xwayland: Add "-listenfd" option · b3f3d65e
      Olivier Fourdan authored
      Using the existing command line option "-listen" for passing file
      descriptors between the Wayland compositor and Xwayland is misleading,
      Xwayland should add is own command line option for that specific use.
      
      As XWayland is spawned by the Wayland compositor, we cannot just change
      the option, as that would break all existing Wayland compositors using
      Xwayland, so we add a new options "-listenfd" and mark the previous one
      as deprecated and log a warning, but it still works for backward
      compatibility.
      Signed-off-by: default avatarOlivier Fourdan <ofourdan@redhat.com>
      xorg/xserver!214
      b3f3d65e
    • Olivier Fourdan's avatar
      xwayland: Allow for regular transport types for listen · 4a287cc2
      Olivier Fourdan authored
      Xwayland uses the command line option “-listen” to pass file descriptors
      from the Wayland compositor.
      
      That breaks the traditional, documented behavior of the “-listen”
      command line option which is to enable a transport type.
      
      Checks if the given option starts with a digit, otherwise treat it as a
      regular transport type.
      
      Closes: xorg/xserver#817
      Suggested-by: Rodrigo Exterckötter Tjäder
      Signed-off-by: default avatarOlivier Fourdan <ofourdan@redhat.com>
      4a287cc2
  11. 18 Jun, 2019 1 commit
    • Adam Jackson's avatar
      xwayland-glx: Fix GLX visual mask setup · 0dc0cef4
      Adam Jackson authored
      a2rgb10 configs would end up with channel masks corresponding to
      argb8888. This would confuse the GLX core code into matching an a2rgb10
      config to the root window visual, and that would make things look wrong
      and bad.
      
      Fix this by handling more cases. We're still not fully general here, and
      this could still be wrong on big-endian. The XXX comment about doing
      something less ugly still applies, ideally we would get this information
      out of EGL instead of making lucky guesses. Still, better than it was.
      
      Fixes: xorg/xserver#824
      0dc0cef4
  12. 17 Jun, 2019 7 commits
    • Jon Turney's avatar
      hw/xwin: Add an option to use alpha channel in multiwindow mode · 2afee831
      Jon Turney authored
      Add an option to turn on the use of the X window's alpha channel in
      multiwindow mode, i.e. this uses the X window's alpha channel for
      compositing into the native desktop.
      
      This works on W7/Vista (using DwmEnableBlurBehindWindow()), and Windows
      10 (using the undocumented SetWindowCompositionAttribute()), but not on
      Windows 8/8.1
      
      -compositewm must be enabled for this to be useful, as we only have a
      pixmap with an alpha channel for the X window in that case.  The
      framebuffer/root window doesn't have one (unless perhaps you are using
      the rootless extension, maybe...).
      
      v2:
      Update meson.build
      
      Future work:
      
      A window property to control use of alpha?
      Option to turn off blur on W7/Vista
      Implement _NET_WM_WINDOW_OPACITY
      2afee831
    • Jon Turney's avatar
      hw/xwin: Set convenience variables for WM_CREATE as well · 2e1bc743
      Jon Turney authored
      Set convenience variables in winTopLevelWindowProc() for WM_CREATE as
      well.
      2e1bc743
    • Jon Turney's avatar
      hw/xwin: Improve performance of -compositewm · f6791835
      Jon Turney authored
      I think that a major cost in the current implementation is doing a
      CreateDIBSection()/DestroyObject() on every refresh.  So provide our own
      CreatePixmap() instead, which does the CreateDIBSection(), once.
      
      Testcase: glxgears or foobillard with direct swrast
      Testcase: scrolling in a full-screen xterm
      
      v2:
      Fix handling of RENDER Scratch Pixmaps
      (A problem easily shown with gitk or emacs)
      
      v3:
      Note that we don't own screen pixmap to release in DestroyPixmap
      Log if unimplemented slow-path ever gets hit
      f6791835
    • Jon Turney's avatar
      hw/xwin: Avoid artefacts when resizing a window · 6865fe71
      Jon Turney authored
      Fill the area outside the current window size with black, rather than
      leaking framebuffer contents or leaving it undrawn.
      6865fe71
    • Jon Turney's avatar
      hw/xwin: A simpleminded attempt at composition · ebcea16e
      Jon Turney authored
      Rather than drawing the window contents from the shadow framebuffer, use
      Composite extension redirection to cause the server to maintain a bitmap
      image of each top-level X window, and draw the window contents from
      that, so that window contents which are occluded in the framebuffer show
      correctly in the task bar and task switcher previews.
      
      v2:
      Fix incorrect use of memset() found by gcc5
      
      hw/xwin/winshadgdi.c: In function ‘winBltExposedWindowRegionShadowGDI’:
      hw/xwin/winshadgdi.c:861:9: warning: ‘memset’ used with constant zero length parameter; this could be due to transposed parameters [-Wmemset-transposed-args]
      
      v3:
      Turn on -compositewm by default
      
      v4:
      Ignore -swcursor if -compositewm
      
      -swcursor is not compatible with -compositewm (because the window
      contents are drawn from an off-screen pixmap, not from the screen
      pixmap, where the software cursor will be drawn).
      
      v5:
      Update meson.build also
      Add -compositewm option to help output
      Update CI to install prerequisites
      ebcea16e
    • Jon Turney's avatar
      hw/xwin: Push multiwindow wndproc WM_PAINT down into drawing engine · adebc376
      Jon Turney authored
      Push the multiwindow wndproc WM_PAINT handling down into the drawing
      engine.  Only the GDI engine is supported in multiwindow mode currently,
      so we only need to do this in the GDI engine.
      adebc376
    • Jon Turney's avatar
      hw/xwin: Align winBltExposedRegionsShadowGDI with winTopLevelWindowProc's WM_PAINT · 065f7335
      Jon Turney authored
      Make winBltExposedRegionsShadowGDI() do the same stuff that
      winTopLevelWindowProc()'s WM_PAINT handler does.
      
      Note that winBltExposedRegionsShadowGDI() is currently used 1) in
      windowed mode when the GDI engine is selected, and 2) in multiwindow
      mode when "Hide Root Window" is off.
      065f7335
  13. 12 Jun, 2019 1 commit
  14. 06 Jun, 2019 1 commit
    • Carlos Garnacho's avatar
      xwayland: Reset scheduled frames after hiding tablet cursor · dea4a746
      Carlos Garnacho authored
      Hiding the tablet tool cursor results in it being hidden forever after.
      This is due to the stale frame callback that will neither be disposed
      or replaced. This can be reproduced in krita (X11) as the pointer
      cursor is hidden while over the canvas.
      
      Clearing the frame callback ensures the correct behavior in future
      xwl_tablet_tool_set_cursor() calls (i.e. a new cursor surface being
      displayed, and a new frame callback created), and is 1:1
      with xwl_seat_set_cursor() for pointers.
      Signed-off-by: Carlos Garnacho's avatarCarlos Garnacho <carlosg@gnome.org>
      dea4a746
  15. 29 May, 2019 1 commit
    • Olivier Fourdan's avatar
      glamor: Make pixmap exportable from `gbm_bo_from_pixmap()` · 26fe29f4
      Olivier Fourdan authored
      If a pixmap is not exportable, `glamor_gbm_bo_from_pixmap()` would fail
      and the modesettings driver would consequently fail to do its page flip,
      which both prevents Present from working and also fill up the logs with
      error messages such as:
      
        (EE) modeset(0): Failed to get GBM bo for flip to new front.
        (EE) modeset(0): present flip failed
      
      Refactor the code so that `glamor_gbm_bo_from_pixmap()` takes care of
      making the pixmap exportable.
      Signed-off-by: default avatarOlivier Fourdan <ofourdan@redhat.com>
      Signed-off-by: Yuxuan Shui yshui@hadean.com
      See-also: !131
      Closes: #68
      Fixes: 86b2d874 "glamor: Reallocate pixmap storage without modifiers
             if necessary"
      26fe29f4
  16. 28 May, 2019 4 commits
    • Olivier Fourdan's avatar
      xwayland: check `glamor_set_pixmap_texture()` status · 48f4ab75
      Olivier Fourdan authored
      With `glamor_set_pixmap_texture()` returning its status, remove the hack
      and use the return value.
      Signed-off-by: default avatarOlivier Fourdan <ofourdan@redhat.com>
      48f4ab75
    • Olivier Fourdan's avatar
      glamor: return status from `glamor_set_pixmap_texture()` · 9e37e41f
      Olivier Fourdan authored
      Chnage the API for `glamor_set_pixmap_texture()` to return a status,
      so that the caller can know whether it succeeded or not.
      Signed-off-by: default avatarOlivier Fourdan <ofourdan@redhat.com>
      9e37e41f
    • Olivier Fourdan's avatar
      xwayland: Check status in GBM pixmap creation · fc6380a1
      Olivier Fourdan authored
      The current code in `xwl_glamor_gbm_create_pixmap_for_bo()` may fail in
      several cases that are not checked for:
      
       - `eglCreateImageKHR()` may have failed to create the image,
       - `glEGLImageTargetTexture2DOES()` may fail and set an error,
       - `glamor_set_pixmap_texture()` may fail for very large pixmaps
          because the corresponding FBO could not be created.
      
      Trying to upload content to a pixmap with no texture will crash Mesa,
      glamor and Xwayland, e.g.:
      
        XXX fail to create fbo.
        (EE)
        (EE) Backtrace:
        (EE) 0: Xwayland (OsSigHandler+0x29)
        (EE) 1: libpthread.so.0 (funlockfile+0x50)
        (EE) 2: libc.so.6 (__memmove_avx_unaligned_erms+0x215)
        (EE) 3: dri/i965_dri.so (_mesa_format_convert+0xab3)
        (EE) 4: dri/i965_dri.so (_mesa_texstore+0x205)
        (EE) 5: dri/i965_dri.so (store_texsubimage+0x28c)
        (EE) 6: dri/i965_dri.so (intel_upload_tex+0x13b)
        (EE) 7: dri/i965_dri.so (texture_sub_image+0x134)
        (EE) 8: dri/i965_dri.so (texsubimage_err+0x150)
        (EE) 9: dri/i965_dri.so (_mesa_TexSubImage2D+0x48)
        (EE) 10: Xwayland (glamor_upload_boxes+0x246)
        (EE) 11: Xwayland (glamor_copy+0x4d1)
        (EE) 12: Xwayland (miCopyRegion+0x96)
        (EE) 13: Xwayland (miDoCopy+0x43c)
        (EE) 14: Xwayland (glamor_copy_area+0x24)
        (EE) 15: Xwayland (damageCopyArea+0xba)
        (EE) 16: Xwayland (compCopyWindow+0x31c)
        (EE) 17: Xwayland (damageCopyWindow+0xd3)
        (EE) 18: Xwayland (miResizeWindow+0x7b7)
        (EE) 19: Xwayland (compResizeWindow+0x3a)
        (EE) 20: Xwayland (ConfigureWindow+0xa96)
        (EE) 21: Xwayland (ProcConfigureWindow+0x7d)
        (EE) 22: Xwayland (Dispatch+0x320)
        (EE) 23: Xwayland (dix_main+0x366)
        (EE) 24: libc.so.6 (__libc_start_main+0xf3)
        (EE) 25: Xwayland (_start+0x2e)
        (EE)
        Fatal server error:
        (EE) Caught signal 11 (Segmentation fault). Server aborting
        (EE)
      
      Check for the possible cases of failure above and fallback to the
      regular glamor pixmap creation when an error is detected.
      Signed-off-by: default avatarOlivier Fourdan <ofourdan@redhat.com>
      Closes: xorg/xserver#661
      fc6380a1
    • Adam Jackson's avatar
      glamor: Fix more fallback paths with non-GXcopy rop with GLES · 766bf01b
      Adam Jackson authored
      Desktop GL can handle arbitrary rops here, GLES can't. The switch
      statement attempts to optimize some cases that GLES can still handle if
      we precompute the right pixel value, but we were then throwing that
      pixel value away and using gc->fgPixel anyway. Fix this, and now
      xts-render passes against glamor+gles.
      766bf01b
  17. 23 May, 2019 1 commit
  18. 21 May, 2019 1 commit
  19. 20 May, 2019 1 commit
    • Olivier Fourdan's avatar
      xwayland: Avoid a crash on pointer enter with a grab · 0a074463
      Olivier Fourdan authored
      On pointer enter notification, Xwayland checks for an existing pointer
      warp with a `NULL` sprite.
      
      In turn, `xwl_pointer_warp_emulator_maybe_lock()` checks for an existing
      grab and the destination window using `XYToWindow()` which does not
      check for the actual sprite not being `NULL`.
      
      So, in some cases, when the pointer enters the surface and there is an
      existing X11 grab which is not an ownerEvents grab, Xwayland would crash
      trying to dereference the `NULL` sprite pointer:
      
        #0  __GI_raise ()
        #1  __GI_abort () at abort.c:79
        #2  OsAbort () at utils.c:1351
        #3  AbortServer () at log.c:879
        #4  FatalError () at log.c:1017
        #5  OsSigHandler () at osinit.c:156
        #6  OsSigHandler () at osinit.c:110
        #7  <signal handler called>
        #8  XYToWindow (pSprite=0x0, x=0, y=0) at events.c:2880
        #9  xwl_pointer_warp_emulator_maybe_lock () at xwayland-input.c:2673
        #10 pointer_handle_enter () at xwayland-input.c:434
      
      Avoid the crash by simply checking for the sprite being not `NULL` in
      `xwl_pointer_warp_emulator_maybe_lock()`
      Signed-off-by: default avatarOlivier Fourdan <ofourdan@redhat.com>
      Bugzilla: https://bugzilla.redhat.com/1708119
      0a074463
  20. 18 May, 2019 1 commit