[Mesa-dev] 7.8, round 2.

[Brian Paul]

On 08/03/2010 01:32 PM, tom fogal wrote:
> I prepared another 7.8 branch.
>
>    * Used '-x' when cherry-picking
>    * Grabbed a few more commits mentioned during discussion
>    * Manually applied some patches
>
> I'm hopeful that there's no commits which aren't either in the set now
> or mentioned below, but please correct me if I'm wrong.  Again, the
> branch is at:
>
>    git://people.freedesktop.org/~tfogal/mesa
>    http://cgit.freedesktop.org/~tfogal/mesa/log/?h=7.8
>
> I forced an update to redo this branch.
>
> Notes on specific commits:
>
>    5d0e136eff54a34258b5adaeda4cb267831e8234
>    1bbf803e3bc8eeabcc2c24b89bc30a30b2445c59
>
>      uniforms.c doesn't exist on 7.8.  When I tracked it back to the
>      original file, it appeared as if these had already been applied.
>      (?)
>
>      Brian: applied in 7dbfc2565e23fec69aa8082997fef48464429cef ?
>
>      Brian, could I get an Ack?

Yes, that change was already on the 7.8 branch.

Acked-by: Brian Paul <brianp at vmware.com>



>    3751e6e1fc385739022d0942b46e175632ad0d4b
>    41f66915ab3d052e0e2ef06000d6534eb7776ec6
>
>      Refactoring meant these couldn't be picked directly.  I applied
>      them manually with commits bcfd2534d24607e26b6afc832c3a64c72994bd30
>      and aca3e1307d19a615829d73e74c8939eb623e677e
>
>      Brian, could I get an Ack?

Acked-by: Brian Paul <brianp at vmware.com>



>    ba03a0b5ba73bc8e79d0ffa6d1da623544716f74
>
>      The patch could not be cherry-picked because it applied to a file
>      that was refactored after 7.8.  I hand-applied the patch to the old
>      source file in 7a1c42ee208b316db4402d98dbf7c701a23f942f.  I do not
>      have any ATI hardware and have not tested this.
>
>      Maciej, could I get an Ack?
>
>    3fde89e4395d260821f4e76a0fe36c265c148a73
>
>      This requires someone with knowledge of pipe_buffers/draw elems to
>      do the merge (i.e.: not me.)
>
>      Brian did the original work here.

I don't have time right now to back-port that one to the 7.8 branch.
The issue it fixes really doesn't happen much in practice anyway.


>    4fd39a8d69cade6db5c4a0295a5f5f3014110b1c
>
>      Needs someone w/ state tracker / renderbuffer knowledge to merge.
>
>      Marek did the original work here.
>
>    e393350904a48d332d832881af9549400194608c
>
>      I merged this one myself (pay careful attention to it, please).
>
>      Brian, could I get an Ack?

Acked-by: Brian Paul <brianp at vmware.com>


>
> I build-tested the OSMesa and xlib cfgs on Linux and OS X, via the
> autoconf build system.  Seems fine.
>
> What'd I miss?

Looks OK.  Did you grab all the commits tagged with "candidate for the 
7.8 branch"?

-Brian