projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 05863c4 a6e5c6c)
Merge branch 'gallium-newclear'
authorRoland Scheidegger <sroland@vmware.com>
Thu, 3 Jun 2010 15:46:14 +0000 (17:46 +0200)
committerRoland Scheidegger <sroland@vmware.com>
Thu, 3 Jun 2010 15:46:14 +0000 (17:46 +0200)
commit992382762a74fd834926fd2c3cd9e14a186e2dd5
treec4572bb01331b71931b3570b36a7acfc38f79a68tree
parent05863c487756c1c9dc823cf639f77cad4111bd23commit | diff
parenta6e5c6c000df8655de3b41d5809547bb41c88c23commit | diff
Merge branch 'gallium-newclear'

Conflicts:
src/gallium/state_trackers/python/p_context.i
12 files changed:
src/gallium/auxiliary/util/u_blitter.c diff1 | diff2 | blob | history
src/gallium/drivers/i915/i915_screen.c diff1 | diff2 | blob | history
src/gallium/drivers/i965/brw_screen.c diff1 | diff2 | blob | history
src/gallium/drivers/llvmpipe/lp_rast.c diff1 | diff2 | blob | history
src/gallium/drivers/llvmpipe/lp_rast.h diff1 | diff2 | blob | history
src/gallium/drivers/llvmpipe/lp_screen.c diff1 | diff2 | blob | history
src/gallium/drivers/llvmpipe/lp_setup.c diff1 | diff2 | blob | history
src/gallium/drivers/r300/r300_screen.c diff1 | diff2 | blob | history
src/gallium/drivers/softpipe/sp_screen.c diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_screen.c diff1 | diff2 | blob | history
src/gallium/drivers/trace/tr_context.c diff1 | diff2 | blob | history
src/gallium/state_trackers/python/p_context.i diff1 | diff2 | blob | history