On 13 May 2013 12:02, Ian Romanick <i...@freedesktop.org> wrote: > I've just picked over a bunch of commits to the 9.1 branch. There are a > few commits (some fairly old) that wouldn't pick cleanly. Hopefully > someone that knows that code can either resolve the conflicts or add the > commit IDs to bin/.cherry-ignore. > > I'd like to release this as 9.1.3 either later this week or early next > week. Does that work for people? >
Any interest in trying to squeeze Chris Forbes' Portal fix ( https://bugs.freedesktop.org/show_bug.cgi?id=64253) into this release? If so, we might want to delay a little, since I don't think that fix has landed in master quite yet. > > Here are the commits that had conflicts that I didn't feel comfortable > trying to resolve: > > c07c18081e3b21070c7db3aea0c7a3**1a31ff20ce wayland: fix segfault when > using software rendering > 49c1fc7044eaaa5c2dca05ff4a709b**e8e3636871 r600g: don't emit > SQ_DYN_GPR_RESOURCE_LIMIT_1 on cayman > aa391976dfa12479185d9eeed1f2a0**b4dce6c49b intel: Allocate hiz in > intel_renderbuffer_move_to_**temp() > This one turned out to be a fairly trivial merge conflict. I'll verify it on Gen6 and try to get it pushed to the 9.1 branch in an hour or two. > a8246927e35a49097f70cffb7fa8dd**05ec1365e1 r600g: Fix UMAD on Cayman > 4c3ed795662974a1c2ad2326fc74be**f608a34f31 r600g: Workaround for a > harware bug with nested loops on Cayman > > This series caused a few regressions in uniform array piglit tests: > > 740350c982bd2735b9eb9063c2b918**56b6f1ad31 i965: Make the fragment shader > pull constants index by dwords, not vec4s. > dca5fc14358a8b267b3854c39c976a**822885898f i965/fs: Improve performance > of varying-index uniform loads on IVB. > 3cf69b228404791cf15231321b6a18**b5701be0a6 i965/fs: Bake regs_written > into the IR instead of recomputing it later. > 70b27e0e4b5d15e575ea477d63c0f6**cb19d645c2 i965/fs: Use LD messages for > pre-gen7 varying-index uniform loads > 62501c3af85089b423218a41a2e243**3ac849c2d3 i965/fs: Allow CSE on pre-gen7 > varying-index uniform loads > ______________________________**_________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/**mailman/listinfo/mesa-dev<http://lists.freedesktop.org/mailman/listinfo/mesa-dev> >
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
