projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b0613d8 dd7be07)
Merge branch 'gallium-nopointsizeminmax'
authorRoland Scheidegger <sroland@vmware.com>
Tue, 9 Feb 2010 18:32:21 +0000 (19:32 +0100)
committerRoland Scheidegger <sroland@vmware.com>
Tue, 9 Feb 2010 18:32:21 +0000 (19:32 +0100)
commit653a83445f94620673f747a4ace6847a2c7fdb4d
treee2c6814da8d809813daffce530b37f3d283e96fftree
parentb0613d87672ea08bb3b9cd56dee714fe413b670ecommit | diff
parentdd7be07c9685012b3e9fdfbaa13dc638abf6a9d1commit | diff
Merge branch 'gallium-nopointsizeminmax'

Conflicts:
src/gallium/drivers/nv10/nv10_state.c
src/gallium/drivers/nv20/nv20_state.c
src/gallium/drivers/nv50/nv50_program.c
21 files changed:
src/gallium/auxiliary/draw/draw_pipe_validate.c diff1 | diff2 | blob | history
src/gallium/docs/source/cso/rasterizer.rst diff1 | diff2 | blob | history
src/gallium/docs/source/tgsi.rst diff1 | diff2 | blob | history
src/gallium/drivers/i965/brw_sf.c diff1 | diff2 | blob | history
src/gallium/drivers/nv30/nv30_state.c diff1 | diff2 | blob | history
src/gallium/drivers/nv40/nv40_state.c diff1 | diff2 | blob | history
src/gallium/drivers/nv50/nv50_program.c diff1 | diff2 | blob | history
src/gallium/drivers/nv50/nv50_state.c diff1 | diff2 | blob | history
src/gallium/drivers/r300/r300_state.c diff1 | diff2 | blob | history
src/gallium/drivers/softpipe/sp_video_context.c diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_context.h diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_pipe_rasterizer.c diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_screen.c diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_state_rss.c diff1 | diff2 | blob | history
src/gallium/drivers/trace/tr_dump_state.c diff1 | diff2 | blob | history
src/gallium/include/pipe/p_defines.h diff1 | diff2 | blob | history
src/gallium/include/pipe/p_state.h diff1 | diff2 | blob | history
src/gallium/state_trackers/python/retrace/interpreter.py diff1 | diff2 | blob | history
src/mesa/shader/prog_statevars.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_extensions.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_mesa_to_tgsi.c diff1 | diff2 | blob | history