diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-03-21 09:54:53 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-03-21 09:54:53 +0000 |
| commit | be7af29d3ad1a10409b0ea689d882cf30a4e1d62 (patch) | |
| tree | a3675995b8dbe62b60571ff96cbf281868ec9c25 /src/gallium/drivers/softpipe | |
| parent | d22c2c6cb23a063e3334a165d0c5c3d73f05d234 (diff) | |
| parent | 12deb9e6ca76d222badf71c8643e84640673e86d (diff) | |
Merge commit 'origin/master' into gallium-resources
Conflicts:
src/gallium/auxiliary/cso_cache/cso_context.c
src/gallium/auxiliary/cso_cache/cso_context.h
src/gallium/drivers/r300/r300_context.c
src/gallium/drivers/r300/r300_render.c
src/gallium/drivers/r300/r300_state.c
src/gallium/drivers/r300/r300_state_derived.c
src/gallium/state_trackers/vega/api_filters.c
src/gallium/state_trackers/vega/image.c
src/gallium/state_trackers/vega/image.h
src/gallium/state_trackers/vega/mask.c
src/gallium/state_trackers/vega/mask.h
src/gallium/state_trackers/vega/paint.c
src/gallium/state_trackers/vega/paint.h
src/gallium/state_trackers/vega/renderer.c
src/gallium/state_trackers/vega/renderer.h
src/gallium/state_trackers/vega/shader.c
src/gallium/state_trackers/vega/vg_context.h
src/gallium/state_trackers/vega/vg_tracker.c
src/mesa/state_tracker/st_manager.c
Diffstat (limited to 'src/gallium/drivers/softpipe')
0 files changed, 0 insertions, 0 deletions