summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/i915/i915_state_emit.c
AgeCommit message (Collapse)Author
2010-03-10Merge branch 'master' into gallium-sampler-viewMichal Krol
Conflicts: src/gallium/auxiliary/Makefile src/gallium/auxiliary/SConscript src/gallium/auxiliary/tgsi/tgsi_exec.c src/gallium/auxiliary/util/u_blitter.c src/gallium/drivers/i915/i915_context.h src/gallium/drivers/i965/brw_context.h src/gallium/drivers/llvmpipe/lp_context.h src/gallium/drivers/nv50/nv50_context.h src/gallium/drivers/nv50/nv50_state_validate.c src/gallium/drivers/nv50/nv50_tex.c src/gallium/drivers/r300/r300_blit.c src/gallium/drivers/r300/r300_context.h src/gallium/drivers/r300/r300_emit.c src/gallium/drivers/r300/r300_state.c src/gallium/drivers/softpipe/sp_context.h src/gallium/drivers/svga/svga_context.h src/gallium/drivers/svga/svga_pipe_sampler.c
2010-03-02Merge branch 'gallium-format-cleanup'José Fonseca
2010-03-02i915g: Add assert to check for null pointer dereference.Vinson Lee
2010-03-01i915g: Rename pipe formats.José Fonseca
2009-12-10i915: Fix for sampler view changes.michal
2009-10-05i915g: Drop the simple sufixJakob Bornecrantz
None of the other driver have a silly sufix, so just drop it. Nothing new added in this commit or any other commit but this is better marketing.