URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9b346f83a7b672e913a7bb6a089d5dbd7fbdce06 Merge: bd60e6cd5ce7c19e52338f12f73dfa1b622391d5 2fa34bf44c7cd7ba03ce8a7e82fe56898a57e9b4 Author: Roland Scheidegger <srol...@vmware.com> Date: Thu Jan 28 17:23:58 2010 +0100
Merge commit 'origin/perrtblend' Conflicts: src/gallium/drivers/softpipe/sp_screen.c src/gallium/include/pipe/p_defines.h URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2fa34bf44c7cd7ba03ce8a7e82fe56898a57e9b4 Author: Roland Scheidegger <srol...@vmware.com> Date: Thu Jan 28 17:11:49 2010 +0100 gallium: remove PIPE_CAP_S3TC, and add PIPE_CAP_DUAL_SOURCE_BLEND there's no point in keeping deprecated PIPE_CAPS around since there's no stable interface (yet). Reuse the enum for PIPE_CAP_DUAL_SOURCE_BLEND. Drivers advertizing this will accept the pipe blendfactors with SRC1 in them and be able to do dual source blending (src color from pixel shader output 0, and blendfactor with SRC1 will come from output 1, only one render target may be bound when using any of these blend factors). URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a5d67dc0119035c518d9778854948d13f0ce2d69 Author: Christoph Bumiller <e0425...@student.tuwien.ac.at> Date: Tue Jan 26 17:58:50 2010 +0100 nv50: supports independent blend enables URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1a9d01dcde26aee4db662deb7069fa14069062de Author: Roland Scheidegger <srol...@vmware.com> Date: Tue Jan 26 17:32:57 2010 +0100 gallium: add the new PIPE_CAP blend bits to more drivers some drivers will complain if they don't know the cap bit URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=786bd78be4a412e58ded6eed1d6d3e4a61b1ba2b Author: Corbin Simpson <mostawesomed...@gmail.com> Date: Tue Jan 26 07:21:40 2010 -0800 r300g: Per-MRT blending is not supported. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9bc80ff17496feda3b47cf40e577976237f87957 Author: Roland Scheidegger <srol...@vmware.com> Date: Tue Jan 26 15:35:31 2010 +0100 mesa/st: code cleanups for new blend functionality minor code changes, style and comment fixes URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=df4395198ce433251c8bd2d497543c7b389e5aca Author: Roland Scheidegger <srol...@vmware.com> Date: Mon Jan 25 20:20:52 2010 +0100 softpipe: enable new blend functionality works with tests/drawbuffers2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5fae36147e1067ac8b1eb5bcade2f9b1dbf29aa4 Author: Roland Scheidegger <srol...@vmware.com> Date: Mon Jan 25 19:27:05 2010 +0100 st/mesa: handle EXT_draw_buffers2 per rendertarget blend enables / colormasks uses the new gallium per-rt blend functionality URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0d3a6a505d537b879f31be0ed14fa8577717efaf Author: Roland Scheidegger <srol...@vmware.com> Date: Mon Jan 25 16:52:14 2010 +0100 vega: don't enable blending if not necessary In some places blending was enabled even though it wasn't necessary. Also remove a (bogus) reenabling of color writes, which wasn't really used. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dbc0e24ab866ce8bdd974b52e050dd022620b146 Author: Roland Scheidegger <srol...@vmware.com> Date: Mon Jan 25 16:43:33 2010 +0100 xorg: do not enable unnecessary blending for xv URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=13b74b585a013f0f089ea14c9512e3d709bdca67 Author: Roland Scheidegger <srol...@vmware.com> Date: Mon Jan 25 16:41:57 2010 +0100 trace: adapt to blend changes URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6893948d482ab69a41290d1b0172834197ee48f2 Author: Roland Scheidegger <srol...@vmware.com> Date: Mon Jan 25 16:39:39 2010 +0100 svga: adapt to blend changes URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4e6bfa6de1940f1da018aace444ae7ca16792d28 Author: Roland Scheidegger <srol...@vmware.com> Date: Mon Jan 25 16:39:16 2010 +0100 softpipe: adapt to blend changes URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e908abf1740dce1a3b391ce5bcfda4f2a0b480de Author: Roland Scheidegger <srol...@vmware.com> Date: Mon Jan 25 16:38:32 2010 +0100 nouveau: adapt drviers to blend changes URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d241964e47ac5576e754d6e6ae19fece8bf8752c Author: Roland Scheidegger <srol...@vmware.com> Date: Mon Jan 25 16:37:51 2010 +0100 r300g: adapt to blend changes URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4e0c825a799b9982ad62125df1aa876b3b0c110d Author: Roland Scheidegger <srol...@vmware.com> Date: Mon Jan 25 16:37:27 2010 +0100 i965g: adapt to blend changes URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc160fc9b293f155d5ed48912dc09c111b97ec74 Author: Roland Scheidegger <srol...@vmware.com> Date: Mon Jan 25 16:37:09 2010 +0100 i915g: adapt to blend changes URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=88388b99fbde4652d39f4876a2fc0235de415a3f Author: Roland Scheidegger <srol...@vmware.com> Date: Mon Jan 25 16:36:37 2010 +0100 cell: adapt to blend changes URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=99e28d4ee3ce995845d9290b735b1fbe1b96886d Author: Roland Scheidegger <srol...@vmware.com> Date: Mon Jan 25 16:35:56 2010 +0100 llvmpipe: adapt to blend changes URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3770769f21138ba722a38c1400b501fdcedea17d Author: Roland Scheidegger <srol...@vmware.com> Date: Mon Jan 25 16:34:29 2010 +0100 st/python: adapt to blend changes URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=feefa7a510058f57a81e5e928cd2fcb63506624f Author: Roland Scheidegger <srol...@vmware.com> Date: Mon Jan 25 16:33:09 2010 +0100 vega: adapt to blend changes URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=92676b9fe6356a8974830c47c0191d1ca57a0741 Author: Roland Scheidegger <srol...@vmware.com> Date: Mon Jan 25 16:32:18 2010 +0100 xorg: adapt to blend changes URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cbb8d35a3ae999f0192dfdca35f7cbc1d494fabb Author: Roland Scheidegger <srol...@vmware.com> Date: Mon Jan 25 16:31:21 2010 +0100 gallium: fix cast for size calc of pipe_blend_state URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=629bb3fa32f6ca1f8cf43222f4b4c399c91b3b6a Author: Roland Scheidegger <srol...@vmware.com> Date: Thu Jan 21 20:48:13 2010 +0100 docs: enhance blend documentation URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c6c9d3b0914e2c3d8585123055c97d8ac3452fe5 Author: Roland Scheidegger <srol...@vmware.com> Date: Thu Jan 21 20:22:24 2010 +0100 docs: clean up sampler description URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=eba1e2a44718bea398e49d496a78ee002c9922b8 Author: Roland Scheidegger <srol...@vmware.com> Date: Thu Jan 21 19:56:29 2010 +0100 gallium: adapt util code to blend changes URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=41667a9a3e2c809d7d7e65f81782df8c89790bc6 Author: Roland Scheidegger <srol...@vmware.com> Date: Thu Jan 21 19:45:43 2010 +0100 gallium: new PIPE_CAP bits for the independent blend functionality URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=04cb5dfb1e0968300204980b08748a140e5e7918 Author: Roland Scheidegger <srol...@vmware.com> Date: Wed Jan 20 18:27:53 2010 +0100 llvmpipe: adapt to per-rendertarget blend changes URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bef610f693266c338b99511b4d1eea5d5b97644e Author: Roland Scheidegger <srol...@vmware.com> Date: Wed Jan 20 18:26:49 2010 +0100 gallium: prepare for per-rendertarget blend enables, writemasks, blend funcs GL 3.0 (EXT_draw_buffers2) and other APIs allow independent blend enables and write masks per render target, ARB_draw_buffers_blend (and other APIs) also allow independent blend functions. Things like dithering, logic ops however are not extended to be per rendertarget, that might be conceptually possible however it doesn't look like any API wants to expose this. _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit