Age | Commit message (Collapse) | Author |
|
|
|
|
|
Conflicts:
src/gallium/drivers/i915simple/i915_context.h
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
src/gallium/auxiliary/draw/draw_pt_varray.c
|
|
The non-vbuf option is going away...
|
|
probably the last match-gallium-upstream merge for a bit, some cleanup+nv50
work coming RSN...
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
src/gallium/include/pipe/p_util.h
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
The caller can then free the token array immediately.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
src/mesa/state_tracker/st_atom_sampler.c
src/mesa/state_tracker/st_cb_texture.c
|