Merge branch 'i915tex_privbuffers' into softpipe_0_1_branch
authorKeith Whitwell <keith@tungstengraphics.com>
Tue, 31 Jul 2007 13:37:45 +0000 (14:37 +0100)
committerKeith Whitwell <keith@tungstengraphics.com>
Tue, 31 Jul 2007 13:37:45 +0000 (14:37 +0100)
commit9273150f9a8394f4ef630a96f0089ad8cad607f5
tree6a62bb6a88ebcc0af7682a811ab0c628daadd602
parent9bc1c92a0b809c6b60d5e4a2c8909f5f98528919
parent7aefdd518578687f961bb512a2b408857f0b9824
Merge branch 'i915tex_privbuffers' into softpipe_0_1_branch

Conflicts:

src/mesa/drivers/dri/i915tex/intel_buffers.c
src/mesa/drivers/dri/i915tex/intel_context.c
src/mesa/drivers/dri/i915tex/intel_fbo.c
src/mesa/drivers/dri/i915tex/intel_pixel_draw.c
src/mesa/drivers/dri/common/dri_util.c
src/mesa/drivers/dri/i915tex/i915_vtbl.c
src/mesa/drivers/dri/i915tex/intel_buffers.c
src/mesa/drivers/dri/i915tex/intel_context.c
src/mesa/drivers/dri/i915tex/intel_fbo.c
src/mesa/drivers/dri/i915tex/intel_fbo.h