Skip to content

Conversation

@sunweaver
Copy link
Member

This is WIP, PR filed for documentation purposes only...

This PR attempts fixing #325...

jcristau and others added 7 commits February 14, 2017 09:44
 commit 4217db89ecd480fda2ee74fecba06c6713c2a0f0
 Author: Julien Cristau <[email protected]>
 Date:   Mon Mar 7 23:20:33 2016 +0100

    render: free already allocated formats in PictureInit failure case

    Probably pointless, if this fails you're not likely to get far...

    Reviewed-by: Rémi Cardona <[email protected]>
    Signed-off-by: Julien Cristau <[email protected]>

 Backported-to-NX-by: Mike Gabriel <[email protected]>
 commit 211d4c2d353b5e379716484055a3f58235ea65f4
 Author: Chris Wilson <[email protected]>
 Date:   Wed Dec 14 15:55:22 2011 +0000

    render: Propagate allocation failure from createSourcePicture()

    All the callers were already checking for failure, except that
    createSourcePicture() itself was failing to check whether it
    successfully allocated the Picture.

    [ajax: Rebase, fix line wrap of preceding line]

    Signed-off-by: Chris Wilson <[email protected]>
    Reviewed-by: Jeremy Huddleston <[email protected]>

 Backported-to-NX-by: Mike Gabriel <[email protected]>

 This commit is a no-op change and it has to be ported to
 hw/nxagent/NXpicture.c (in a follow-up commit).
…icture()

 Ports X.org Xserver commit 211d4c2 to NXpicture.c.
 commit c7f84c880bbbb508016ad80390a11961b1c4214d
 Author: Chris Wilson <[email protected]>
 Date:   Mon Jan 27 09:44:48 2014 +0000

    render: Fix leak of filter params

    ==11097== 2,048 (+1,640) bytes in 32 (+26) blocks are definitely lost in loss record 1,570 of 1,719
    ==11097==    at 0x4C2A2DB: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
    ==11097==    by 0x225EF3: SetPicturePictFilter (filter.c:339)
    ==11097==    by 0x22DF4F: ProcRenderSetPictureFilter (render.c:1773)
    ==11097==    by 0x15D25D: Dispatch (dispatch.c:432)
    ==11097==    by 0x14C7B9: main (main.c:298)

    [ajax: Fixed whitespace]

    Reviewed-by: Adam Jackson <[email protected]>
    Signed-off-by: Chris Wilson <[email protected]>

 Backported-to-NX-by: Mike Gabriel <[email protected]>

 This commit also removes an unnecessary if (p!=NULL) free (p); check.
 (See X.org commit 99275ad).

 This commit is a no-op code change in nxagent and has been ported to hw/nxagent/NXpicture.c
 in a follow-up commit.
 Ports X.org Xserver commit c7f84c8 to NXpicture.c.
…170)

 commit 802932d112a3f6a09420be9e4a13fa78ac43840b
 Author: Adam Jackson <[email protected]>
 Date:   Mon Nov 17 15:28:58 2014 -0500

    render: fix ChangePicture when Xinerama is active (v2) (#49170)

    ChangePicture takes wire XIDs, but didn't do any Xinerama translation,
    which meant setting a clip pixmap or a separate alpha picture would
    result in those elements pointing at the instance of the pixmap on
    screen 0.  Which is, you know, bad.

    v2: This one actually builds.

    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=49170
    Signed-off-by: Adam Jackson <[email protected]>
    Reviewed-by: Keith Packard <[email protected]>
    Signed-off-by: Keith Packard <[email protected]>

 Backported-to-NX-by: Mike Gabriel <[email protected]>
@sunweaver sunweaver added this to the 3.6.0.0 milestone Feb 14, 2017
@sunweaver sunweaver self-assigned this Feb 14, 2017
@Ionic
Copy link
Member

Ionic commented Feb 14, 2017

Mh, that conflicts with my render update, but I guess it doesn't make a big difference the update isn't fully working anyway, at least currently.

@sunweaver
Copy link
Member Author

sunweaver commented Feb 14, 2017 via email

@Ionic
Copy link
Member

Ionic commented Feb 15, 2017

Not really, I've tried to keep it render-centric as much as possible, only changing other parts when absolutely necessary. It's highly inter-dependent and will likely just fall apart if you pick separate commits instead of the full deal.

@sunweaver sunweaver modified the milestones: 3.6.1.0, 3.6.0.0 Mar 2, 2017
@sunweaver
Copy link
Member Author

Will be superseded by #440. Thus, closing...

@sunweaver sunweaver closed this Apr 19, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants