projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e497a58 ae7b7bf)
Merge branch 'gallium-vertexelementcso'
authorRoland Scheidegger <sroland@vmware.com>
Tue, 9 Mar 2010 14:59:40 +0000 (15:59 +0100)
committerRoland Scheidegger <sroland@vmware.com>
Tue, 9 Mar 2010 14:59:40 +0000 (15:59 +0100)
commit685340a53e1dcb2a888e634ee71ba24356befe69
treed6aa301eb5370eac6fcb3186d26a551c37b3c3a2tree
parente497a58fad878d913a1795b239ddd05870988c58commit | diff
parentae7b7bf1edcf6c492b4dcc162bca28a0090f601ecommit | diff
Merge branch 'gallium-vertexelementcso'

Conflicts:
src/gallium/auxiliary/cso_cache/cso_context.c
src/gallium/auxiliary/util/u_blit.c
src/gallium/auxiliary/util/u_gen_mipmap.c
src/gallium/drivers/i915/i915_context.h
src/gallium/drivers/i965/brw_draw_upload.c
src/gallium/drivers/r300/r300_blit.c
src/gallium/drivers/r300/r300_context.h
src/gallium/drivers/r300/r300_render.c
src/gallium/drivers/r300/r300_state_derived.c
src/mesa/state_tracker/st_cb_bitmap.c
src/mesa/state_tracker/st_cb_clear.c
33 files changed:
progs/gallium/python/retrace/interpreter.py diff1 | diff2 | blob | history
src/gallium/auxiliary/cso_cache/cso_context.c diff1 | diff2 | blob | history
src/gallium/auxiliary/cso_cache/cso_context.h diff1 | diff2 | blob | history
src/gallium/auxiliary/draw/draw_pt.c diff1 | diff2 | blob | history
src/gallium/auxiliary/util/u_blit.c diff1 | diff2 | blob | history
src/gallium/auxiliary/util/u_blitter.c diff1 | diff2 | blob | history
src/gallium/auxiliary/util/u_blitter.h diff1 | diff2 | blob | history
src/gallium/auxiliary/util/u_dump_state.c diff1 | diff2 | blob | history
src/gallium/auxiliary/util/u_format.h diff1 | diff2 | blob | history
src/gallium/auxiliary/util/u_gen_mipmap.c diff1 | diff2 | blob | history
src/gallium/drivers/i915/i915_context.h diff1 | diff2 | blob | history
src/gallium/drivers/llvmpipe/lp_context.c diff1 | diff2 | blob | history
src/gallium/drivers/nv30/nv30_context.h diff1 | diff2 | blob | history
src/gallium/drivers/nv40/nv40_context.h diff1 | diff2 | blob | history
src/gallium/drivers/nv40/nv40_state.c diff1 | diff2 | blob | history
src/gallium/drivers/nv50/nv50_context.h diff1 | diff2 | blob | history
src/gallium/drivers/r300/r300_blit.c diff1 | diff2 | blob | history
src/gallium/drivers/r300/r300_context.h diff1 | diff2 | blob | history
src/gallium/drivers/r300/r300_emit.c diff1 | diff2 | blob | history
src/gallium/drivers/r300/r300_render.c diff1 | diff2 | blob | history
src/gallium/drivers/r300/r300_state.c diff1 | diff2 | blob | history
src/gallium/drivers/r300/r300_state_derived.c diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_pipe_vertex.c diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_state_need_swtnl.c diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_state_vdecl.c diff1 | diff2 | blob | history
src/gallium/drivers/trace/tr_dump_state.c diff1 | diff2 | blob | history
src/gallium/include/pipe/p_state.h diff1 | diff2 | blob | history
src/mesa/state_tracker/st_cb_bitmap.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_cb_clear.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_cb_drawpixels.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_context.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_context.h diff1 | diff2 | blob | history
src/mesa/state_tracker/st_draw.c diff1 | diff2 | blob | history