Module: Mesa Branch: master Commit: dc4c821f0817a3db716f965692fb701079f66340 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dc4c821f0817a3db716f965692fb701079f66340
Author: Marek Olšák <[email protected]> Date: Tue Jan 10 00:19:00 2012 +0100 Squash-merge branch 'gallium-clip-state' Conflicts: src/gallium/auxiliary/tgsi/tgsi_strings.c src/mesa/state_tracker/st_atom_clip.c commit d919791f2742e913173d6b335128e7d4c63c0840 Author: Christoph Bumiller <[email protected]> Date: Fri Jan 6 17:59:22 2012 +0100 d3d1x: adapt to new clip state commit cfec82bca3fefcdefafca3f4555285ec1d1ae421 Author: Christoph Bumiller <[email protected]> Date: Fri Jan 6 14:16:51 2012 +0100 gallium/docs: update for clip state changes commit c02bfeb81ad9f62041a2285ea6373bbbd602912a Author: Christoph Bumiller <[email protected]> Date: Fri Jan 6 14:21:43 2012 +0100 tgsi: add TGSI_PROPERTY_PROHIBIT_UCPS commit d4e0a785a6a23ad2f6819fd72e236acb9750028d Author: Brian Paul <[email protected]> Date: Thu Jan 5 08:30:00 2012 -0700 tgsi: consolidate TGSI string arrays in new tgsi_strings.h There was some duplication between the tgsi_dump.c and tgsi_text.c files. Also use some static assertions to help catch errors when adding new TGSI values. v2: put strings in tgsi_strings.c file instead of the .h file. Reviewed-by: Dave Airlie <[email protected]> commit c28584ce0d8c62bd92c8f140729d344f88a0b3cd Author: Christoph Bumiller <[email protected]> Date: Fri Jan 6 12:48:09 2012 +0100 gallium: extend user_clip_plane_enable to apply to clip distances commit f1d5016c07f786229ed057effbe55fbfd160b019 Author: Marek Olšák <[email protected]> Date: Fri Jan 6 02:39:09 2012 +0100 nvfx: adapt to new clip state commit 6f6fa1c26bd19f797c1996731708e3569c9bfe24 Author: Marek Olšák <[email protected]> Date: Fri Jan 6 01:41:39 2012 +0100 st/mesa: fix DrawPixels with GL_DEPTH_CLAMP commit c86ad730aa1c017788ae88a55f54071bf222be12 Author: Christoph Bumiller <[email protected]> Date: Tue Jan 3 23:51:30 2012 +0100 nv50: adapt to new clip state commit 3a8ae6ac243bae5970729dc4057fe02d992543dc Author: Christoph Bumiller <[email protected]> Date: Tue Jan 3 23:32:36 2012 +0100 nvc0: adapt to new clip state commit 6243a8246997f8d2fcc69ab741a2c2dea080ff11 Author: Marek Olšák <[email protected]> Date: Thu Dec 29 01:32:51 2011 +0100 draw: initalize pt.user.planes in draw_init This fixes a crash in glean/fpexceptions. commit e3056524b19b56d473f4faff84ffa0eb41497408 Author: Marek Olšák <[email protected]> Date: Mon Dec 26 06:26:55 2011 +0100 svga: adapt to new clip state commit c5bfa8b37d6d489271df457229081d6bbb51b4b7 Author: Marek Olšák <[email protected]> Date: Sun Dec 25 14:11:51 2011 +0100 r600g: adapt to new clip state commit f11890905362f62627c4a28a8255b76eb7de7df2 Author: Marek Olšák <[email protected]> Date: Sun Dec 25 14:10:26 2011 +0100 r300g: adapt to new clip state commit e37465327c79a01112f15f6278d9accc5bf3103f Author: Marek Olšák <[email protected]> Date: Sun Dec 25 12:39:16 2011 +0100 draw: adapt to new clip state This adds a regression in the LLVM clipping path. Can anybody see anything wrong with the code? It works for every other case, just glean/fpexceptions crashes when doing the "Infinite clip plane test". commit b474d2b18c72d965eefae4e427c269cba5ce6ba2 Author: Marek Olšák <[email protected]> Date: Sun Dec 25 13:14:59 2011 +0100 u_blitter: don't save/set/restore clip state commit 9dd240ea91f523a677af45e8d0adb9e661e28602 Author: Marek Olšák <[email protected]> Date: Sun Dec 25 13:11:56 2011 +0100 gallium: don't cso_save/set/restore clip state The enable bits are in the rasterizer state. commit a4f7031179f5f4ad524b34b394214b984ac950f6 Author: Marek Olšák <[email protected]> Date: Sun Dec 25 12:58:55 2011 +0100 gallium: default depth_clip to 1 depth_clip = !depth_clamp commit fe21147a00ab90e549d63fe12ee4625c9c2ffcc3 Author: Marek Olšák <[email protected]> Date: Mon Dec 26 06:14:19 2011 +0100 trace,util: update state logging to new clip state Also dump the other missing flags. commit 2a3b96e84ac872dcc5bc1de049fe76bb58d64b23 Author: Marek Olšák <[email protected]> Date: Sun Dec 25 10:43:43 2011 +0100 st/mesa: adapt to new clip state commit b7b656a42fca19d7c85267f42649a206a85a2c72 Author: Marek Olšák <[email protected]> Date: Sat Dec 17 15:45:19 2011 +0100 gallium: move state enable bits from clip_state to rasterizer_state --- src/gallium/auxiliary/cso_cache/cso_context.c | 17 +--- src/gallium/auxiliary/draw/draw_cliptest_tmp.h | 16 +++- src/gallium/auxiliary/draw/draw_context.c | 21 ++--- src/gallium/auxiliary/draw/draw_llvm.c | 20 +++-- src/gallium/auxiliary/draw/draw_llvm.h | 4 +- src/gallium/auxiliary/draw/draw_private.h | 2 - src/gallium/auxiliary/postprocess/pp_program.c | 1 + src/gallium/auxiliary/tgsi/tgsi_strings.c | 3 +- src/gallium/auxiliary/util/u_blit.c | 8 +-- src/gallium/auxiliary/util/u_blitter.c | 9 +-- src/gallium/auxiliary/util/u_blitter.h | 8 -- src/gallium/auxiliary/util/u_dump_state.c | 7 +- src/gallium/auxiliary/util/u_gen_mipmap.c | 5 +- src/gallium/auxiliary/vl/vl_compositor.c | 1 + src/gallium/auxiliary/vl/vl_idct.c | 1 + src/gallium/auxiliary/vl/vl_mc.c | 1 + src/gallium/auxiliary/vl/vl_zscan.c | 1 + src/gallium/docs/source/cso/rasterizer.rst | 14 +++ src/gallium/docs/source/tgsi.rst | 11 +++ src/gallium/drivers/i915/i915_screen.c | 2 +- src/gallium/drivers/i915/i915_surface.c | 1 - src/gallium/drivers/llvmpipe/lp_screen.c | 2 +- src/gallium/drivers/nv50/nv50_screen.c | 2 +- src/gallium/drivers/nv50/nv50_shader_state.c | 6 -- src/gallium/drivers/nv50/nv50_state.c | 23 ++++- src/gallium/drivers/nv50/nv50_state_validate.c | 59 +++++++------ src/gallium/drivers/nv50/nv50_stateobj.h | 2 +- src/gallium/drivers/nv50/nv50_surface.c | 7 -- src/gallium/drivers/nvc0/nvc0_screen.c | 2 +- src/gallium/drivers/nvc0/nvc0_shader_state.c | 35 -------- src/gallium/drivers/nvc0/nvc0_state.c | 18 +++- src/gallium/drivers/nvc0/nvc0_state_validate.c | 92 +++++++++++++------ src/gallium/drivers/nvc0/nvc0_stateobj.h | 2 +- src/gallium/drivers/nvc0/nvc0_surface.c | 7 -- src/gallium/drivers/nvfx/nvfx_screen.c | 2 +- src/gallium/drivers/nvfx/nvfx_state_emit.c | 49 +++++++---- src/gallium/drivers/nvfx/nvfx_surface.c | 1 - src/gallium/drivers/r300/r300_blit.c | 1 - src/gallium/drivers/r300/r300_context.c | 14 +--- src/gallium/drivers/r300/r300_context.h | 4 +- src/gallium/drivers/r300/r300_flush.c | 1 + src/gallium/drivers/r300/r300_render.c | 2 - src/gallium/drivers/r300/r300_screen.c | 2 +- src/gallium/drivers/r300/r300_state.c | 25 +++--- src/gallium/drivers/r600/evergreen_state.c | 10 +- src/gallium/drivers/r600/r600_blit.c | 3 - src/gallium/drivers/r600/r600_pipe.c | 2 +- src/gallium/drivers/r600/r600_state.c | 10 +- src/gallium/drivers/svga/svga_state_framebuffer.c | 2 +- src/gallium/drivers/svga/svga_state_rss.c | 2 +- src/gallium/drivers/trace/tr_dump_state.c | 7 +- src/gallium/include/pipe/p_defines.h | 2 +- src/gallium/include/pipe/p_shader_tokens.h | 3 +- src/gallium/include/pipe/p_state.h | 18 ++++- .../state_trackers/d3d1x/dxgi/src/dxgi_native.cpp | 1 + .../state_trackers/d3d1x/gd3d11/d3d11_context.h | 18 +---- .../state_trackers/d3d1x/gd3d11/d3d11_objects.h | 6 +- .../state_trackers/d3d1x/gd3d11/d3d11_screen.h | 3 +- src/gallium/state_trackers/vega/renderer.c | 1 + src/gallium/state_trackers/xa/xa_renderer.c | 1 + src/gallium/state_trackers/xorg/xorg_renderer.c | 1 + src/gallium/tests/graw/fs-test.c | 1 + src/gallium/tests/graw/gs-test.c | 1 + src/gallium/tests/graw/quad-sample.c | 1 + src/gallium/tests/graw/quad-tex.c | 1 + src/gallium/tests/graw/shader-leak.c | 1 + src/gallium/tests/graw/tri-gs.c | 1 + src/gallium/tests/graw/tri-instanced.c | 1 + src/gallium/tests/graw/tri.c | 1 + src/gallium/tests/graw/vs-test.c | 1 + src/gallium/tests/trivial/quad-tex.c | 1 + src/gallium/tests/trivial/tri.c | 1 + src/mesa/state_tracker/st_atom_clip.c | 24 ++---- src/mesa/state_tracker/st_atom_rasterizer.c | 7 ++- src/mesa/state_tracker/st_cb_bitmap.c | 1 + src/mesa/state_tracker/st_cb_clear.c | 4 +- src/mesa/state_tracker/st_cb_drawpixels.c | 1 + src/mesa/state_tracker/st_context.h | 1 - src/mesa/state_tracker/st_extensions.c | 2 +- 79 files changed, 330 insertions(+), 322 deletions(-) Diff: http://cgit.freedesktop.org/mesa/mesa/diff/?id=dc4c821f0817a3db716f965692fb701079f66340 _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
