[PATCH xserver 2/2] glamor: Avoid software fallback for planemasked ZPixmap GetImage

Adam Jackson ajax at redhat.com
Mon Mar 20 17:59:12 UTC 2017


On Mon, 2017-03-20 at 10:42 -0700, Eric Anholt wrote:
> > Adam Jackson <ajax at redhat.com> writes:
> > @@ -128,6 +128,16 @@ glamor_get_image_gl(DrawablePtr drawable, int x, int y, int w, int h,
> >                            drawable->x + off_x, drawable->y + off_y,
> >                            -x, -y,
> >                            (uint8_t *) d, byte_stride);
> > +
> > +    if (!glamor_pm_is_solid(drawable->depth, plane_mask)) {
> > +        FbStip pm = fbReplicatePixel(plane_mask, drawable->bitsPerPixel);
> > +        FbStip *dst = (void *)d;
> > +        uint32_t dstStride = byte_stride /= sizeof(FbStip);
> 
> I don't think you want the second '=' here.  Harmless, but looked weird.
> 
> Other than that, r-b.

Good eye. Pretty sure that was a leftover from an earlier iteration of
the patch. Fixed that up and merged:

remote: I: patch #112622 updated using rev 4aa35c46dab72bc945981f6fd29e494133bc2b0a.
remote: E: failed to find patch for rev 1ad230682338a9d2fc6eca6966a5bebb007df32c.
remote: I: 1 patch(es) updated to state Accepted.
To ssh://git.freedesktop.org/git/xorg/xserver
   368f60d..1ad2306  master -> master

- ajax


More information about the xorg-devel mailing list