Re: [PATCH] glx: do not pick sRGB config for 32-bit RGBA visual
Hi; Any comments? Without this change there will be issues with certain Linux desktops when distributions start to use Mesa 17.4. On 11/28/2017 09:23 AM, Tapani Pälli wrote: This fixes blending issues seen with kwin and gnome-shell when 32bit visual has sRGB capability set. Signed-off-by: Tapani Pälli Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103699 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103646 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103655 --- glx/glxscreens.c | 5 + 1 file changed, 5 insertions(+) diff --git a/glx/glxscreens.c b/glx/glxscreens.c index 73444152a..596d972e0 100644 --- a/glx/glxscreens.c +++ b/glx/glxscreens.c @@ -271,6 +271,11 @@ pickFBConfig(__GLXscreen * pGlxScreen, VisualPtr visual) /* If it's the 32-bit RGBA visual, demand a 32-bit fbconfig. */ if (visual->nplanes == 32 && config->rgbBits != 32) continue; +/* If it's the 32-bit RGBA visual, do not pick sRGB capable config. + * This can cause issues with compositors that are not sRGB aware. + */ +if (visual->nplanes == 32 && config->sRGBCapable == GL_TRUE) +continue; /* Can't use the same FBconfig for multiple X visuals. I think. */ if (config->visualID != 0) continue; ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] Handle animated cursor on shared sprite
Keith/Adam,
Another patch for cursor issues that can cause the Xserver to crash
that's over 12 months old and hasn't been committed or commented on.
Can you take a look at this too ?
Thanks,
Alan.
On 12/10/16 10:05, Pierre Ossman wrote:
> Sprites (and hence cursors) can be shared between multiple devices.
> However the animation code was not prepared for this and could wind
> up in a case where it would continue to animate a free:d cursor.
> ---
> include/inputstr.h | 14 -
> render/animcur.c | 85
> +-
> 2 files changed, 51 insertions(+), 48 deletions(-)
>
> diff --git a/include/inputstr.h b/include/inputstr.h
> index 568f5f9..a485f5e 100644
> --- a/include/inputstr.h
> +++ b/include/inputstr.h
> @@ -246,6 +246,12 @@ typedef struct _SpriteRec {
> ScreenPtr pEnqueueScreen;
> ScreenPtr pDequeueScreen;
> +/* keep states for animated cursor */
> +struct {
> +ScreenPtr pScreen;
> +int elt;
> +CARD32 time;
> +} anim;
> } SpriteRec;
> typedef struct _KeyClassRec {
> @@ -509,14 +515,6 @@ typedef struct _SpriteInfoRec {
> DeviceIntPtr paired;/* The paired device. Keyboard if
> spriteOwner is TRUE, otherwise the
> pointer that owns the sprite. */
> -
> -/* keep states for animated cursor */
> -struct {
> -CursorPtr pCursor;
> -ScreenPtr pScreen;
> -int elt;
> -CARD32 time;
> -} anim;
> } SpriteInfoRec, *SpriteInfoPtr;
> /* device types */
> diff --git a/render/animcur.c b/render/animcur.c
> index 52e6b8b..fc87e0d 100644
> --- a/render/animcur.c
> +++ b/render/animcur.c
> @@ -142,35 +142,42 @@ AnimCurTimerNotify(OsTimerPtr timer, CARD32 now, void
> *arg)
> CARD32 soonest = ~0; /* earliest time to wakeup again */
> for (dev = inputInfo.devices; dev; dev = dev->next) {
> -if (IsPointerDevice(dev) && pScreen ==
> dev->spriteInfo->anim.pScreen) {
> -if (!activeDevice)
> -activeDevice = TRUE;
> -
> -if ((INT32) (now - dev->spriteInfo->anim.time) >= 0) {
> -AnimCurPtr ac = GetAnimCur(dev->spriteInfo->anim.pCursor);
> -int elt = (dev->spriteInfo->anim.elt + 1) % ac->nelt;
> -DisplayCursorProcPtr DisplayCursor;
> -
> -/*
> - * Not a simple Unwrap/Wrap as this
> - * isn't called along the DisplayCursor
> - * wrapper chain.
> - */
> -DisplayCursor = pScreen->DisplayCursor;
> -pScreen->DisplayCursor = as->DisplayCursor;
> -(void) (*pScreen->DisplayCursor) (dev,
> - pScreen,
> - ac->elts[elt].pCursor);
> -as->DisplayCursor = pScreen->DisplayCursor;
> -pScreen->DisplayCursor = DisplayCursor;
> -
> -dev->spriteInfo->anim.elt = elt;
> -dev->spriteInfo->anim.time = now + ac->elts[elt].delay;
> -}
> -
> -if (soonest > dev->spriteInfo->anim.time)
> -soonest = dev->spriteInfo->anim.time;
> +if (!IsPointerDevice(dev))
> +continue;
> +if (!dev->spriteInfo->spriteOwner)
> +continue;
> +if (!IsAnimCur(dev->spriteInfo->sprite->current))
> +continue;
> +if (pScreen != dev->spriteInfo->sprite->anim.pScreen)
> +continue;
> +
> +if (!activeDevice)
> +activeDevice = TRUE;
> +
> +if ((INT32) (now - dev->spriteInfo->sprite->anim.time) >= 0) {
> +AnimCurPtr ac = GetAnimCur(dev->spriteInfo->sprite->current);
> +int elt = (dev->spriteInfo->sprite->anim.elt + 1) % ac->nelt;
> +DisplayCursorProcPtr DisplayCursor;
> +
> +/*
> + * Not a simple Unwrap/Wrap as this
> + * isn't called along the DisplayCursor
> + * wrapper chain.
> + */
> +DisplayCursor = pScreen->DisplayCursor;
> +pScreen->DisplayCursor = as->DisplayCursor;
> +(void) (*pScreen->DisplayCursor) (dev,
> + pScreen,
> + ac->elts[elt].pCursor);
> +as->DisplayCursor = pScreen->DisplayCursor;
> +pScreen->DisplayCursor = DisplayCursor;
> +
> +dev->spriteInfo->sprite->anim.elt = elt;
> +dev->spriteInfo->sprite->anim.time = now + ac->elts[elt].delay;
> }
> +
> +if (soonest > dev->spriteInfo->sprite->anim.time)
> +soonest = dev->spriteInfo->sprite->anim.time;
> }
> if (activeDevice)
> @@ -192,17 +199,17 @@ AnimCurDisplayCursor(DeviceIntPtr pDev, ScreenPtr
> pScreen, CursorPtr pCursor)
> Unwrap(as, pSc
Re: [PATCH xserver] test: Fix build dependency for bigreq test
Adam Jackson writes: > libxcb-xinput isn't a thing in whichever Ubuntu it is that Travis is > using. The test is already optional, make it more so. We should probably be including current xcb in the docker image. This seems correct, though: Reviewed-by: Eric Anholt signature.asc Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
xserver 1.19.6 tentative release date (was Re: [PATCH xserver] xfixes: Remove the CursorCurrent array)
On Fri, 2017-12-08 at 17:25 +, Alan Hourihane wrote: > But I've gone ahead and tested your fix, and it works too. So I'm fine > with this. > > Can we get this merged to the stable branches ? Done. I'm going on PTO for the end of the year beginning next week, so I'll try to kick out a 1.19.6 release by this Friday, December 15. If anyone has additional patches they'd like to see merged for that please give a shout (I've seen the shared-sprite one, getting to that shortly). - ajax ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH bdftopcf] Depend on xproto and fsproto that are now used.
On Sun, 2017-12-10 at 10:08 -0800, Matt Turner wrote: > On Sun, Dec 10, 2017 at 4:50 AM, Matthieu Herrb > wrote: > > Signed-off-by: Matthieu Herrb > > --- > > Yep, I came to the same conclusion in Gentoo. > > Reviewed-by: Matt Turner D'oh. Didn't catch that because Fedora's libX11-devel package drags in all the protocol headers, and we build bdftopcf in the same pass as some other font utilities that _do_ require libX11. - ajax ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH randrproto 2/2] Add non-desktop output property and behaviors [v3]
On Thu, 2017-12-07 at 16:57 -0800, Keith Packard wrote: > @@ -186,14 +186,23 @@ from the CRTCs. The Monitor marked as Primary will be > listed first. > > 1.6. Introduction to version 1.6 of the extension > > -Version 1.6 adds resource leasing. > +Version 1.6 adds resource leasing and non desktop output management. > > - • A 'Lease' is a collection of crtcs and outputs which are made > + • A “Lease” is a collection of crtcs and outputs which are made Gross. But other than smart quotes the protocol looks plausible enough to me. Are we happy enough with the unified protocol repo yet? I'd like to get this and the DRI3 bits landed sooner than later and it seems silly to do the work twice. - ajax ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH randrproto 2/2] Add non-desktop output property and behaviors [v3]
Adam Jackson writes: > On Thu, 2017-12-07 at 16:57 -0800, Keith Packard wrote: > >> @@ -186,14 +186,23 @@ from the CRTCs. The Monitor marked as Primary will be >> listed first. >> >> 1.6. Introduction to version 1.6 of the extension >> >> -Version 1.6 adds resource leasing. >> +Version 1.6 adds resource leasing and non desktop output management. >> >> - • A 'Lease' is a collection of crtcs and outputs which are made >> + • A “Lease” is a collection of crtcs and outputs which are made > > Gross. But other than smart quotes the protocol looks plausible enough > to me. Are we happy enough with the unified protocol repo yet? I'd like > to get this and the DRI3 bits landed sooner than later and it seems > silly to do the work twice. I'm not sure what the status of the unified repo is -- has someone re-run the scripts over the current bits? -- -keith signature.asc Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
Re: xserver 1.19.6 tentative release date (was Re: [PATCH xserver] xfixes: Remove the CursorCurrent array)
On 11/12/17 20:29, Adam Jackson wrote: > On Fri, 2017-12-08 at 17:25 +, Alan Hourihane wrote: > >> But I've gone ahead and tested your fix, and it works too. So I'm fine >> with this. >> >> Can we get this merged to the stable branches ? > Done. I'm going on PTO for the end of the year beginning next week, so > I'll try to kick out a 1.19.6 release by this Friday, December 15. If > anyone has additional patches they'd like to see merged for that please > give a shout (I've seen the shared-sprite one, getting to that > shortly). > That would be excellent. Thanks ! Alan. ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
