On 05/15/2013 10:47 AM, EoD wrote:
On 13/05/13 21:02, Ian Romanick 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?
Here are the commits that had conflicts that I didn't feel comfortable
trying to resolve:
c07c18081e3b21070c7db3aea0c7a31a31ff20ce wayland: fix segfault when
using software rendering
49c1fc7044eaaa5c2dca05ff4a709be8e3636871 r600g: don't emit
SQ_DYN_GPR_RESOURCE_LIMIT_1 on cayman
aa391976dfa12479185d9eeed1f2a0b4dce6c49b intel: Allocate hiz in
intel_renderbuffer_move_to_temp()
a8246927e35a49097f70cffb7fa8dd05ec1365e1 r600g: Fix UMAD on Cayman
4c3ed795662974a1c2ad2326fc74bef608a34f31 r600g: Workaround for a harware
bug with nested loops on Cayman
This series caused a few regressions in uniform array piglit tests:
740350c982bd2735b9eb9063c2b91856b6f1ad31 i965: Make the fragment shader
pull constants index by dwords, not vec4s.
dca5fc14358a8b267b3854c39c976a822885898f i965/fs: Improve performance of
varying-index uniform loads on IVB.
3cf69b228404791cf15231321b6a18b5701be0a6 i965/fs: Bake regs_written into
the IR instead of recomputing it later.
70b27e0e4b5d15e575ea477d63c0f6cb19d645c2 i965/fs: Use LD messages for
pre-gen7 varying-index uniform loads
62501c3af85089b423218a41a2e2433ac849c2d3 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
Could those "Fix build with LLVM >= r180063" also go into the 9.1 branch?
ead4db420e9e5408f41c70768a290592a384aedb gallivm: Fix build with LLVM >=
r180063
a0c8942bb4742b4bd22f494cea4dcd59d9ca99ab radeon/llvm: Fix build with
LLVM >= r180063
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
You need all of these to fix Mesa 9.1 build with LLVM 3.3 snapshot. And
that's without r600 LLVM compiler and Clover state tracker. I guess
they'd need even more.
http://cgit.freedesktop.org/mesa/mesa/patch/?id=ead4db420e9e5408f41c70768a290592a384aedb
http://cgit.freedesktop.org/mesa/mesa/patch/?id=4742f9b00b804dd01eb9955dd386a2373cd8eb36
http://cgit.freedesktop.org/mesa/mesa/patch/?id=6249db73ea580e6a54874235ffb3a7d42ac63bb4
http://cgit.freedesktop.org/mesa/mesa/patch/?id=7cd248aa7938a068663fcd605169b7d4e21636bf
http://cgit.freedesktop.org/mesa/mesa/patch/?id=a0c8942bb4742b4bd22f494cea4dcd59d9ca99ab
http://cgit.freedesktop.org/mesa/mesa/patch/?id=cd84353d576246273d1c6ae8e96b65217be15ebc
Given that none of them applies cleanly, and I've only build tested
them, I don't think it's a good idea to support LLVM 3.3 in 9.1 branch.
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
