Merge branch 'master' into i915-unification
authorEric Anholt <eric@anholt.net>
Wed, 19 Sep 2007 18:05:36 +0000 (11:05 -0700)
committerEric Anholt <eric@anholt.net>
Thu, 20 Sep 2007 16:04:20 +0000 (09:04 -0700)
commit4f1c9f7e510122b32c82ee9adbdb4987dae27afe
tree30cb409cf46cd11a6a14178985f7c69468e5b0f9
parente3745dac59602a9d21b49d602646de5aef95075f
parent45899a494c578d406b29e5ee17c0f1b6bf12c2de
Merge branch 'master' into i915-unification

Conflicts:

src/mesa/drivers/dri/common/dri_drmpool.c
src/mesa/drivers/dri/i915tex/i915_vtbl.c
src/mesa/drivers/dri/i915tex/intel_batchbuffer.c
src/mesa/drivers/dri/i915tex/intel_context.c
14 files changed:
src/mesa/drivers/dri/Makefile.template
src/mesa/drivers/dri/i915tex/Makefile
src/mesa/drivers/dri/i915tex/i830_vtbl.c
src/mesa/drivers/dri/i915tex/i915_context.h
src/mesa/drivers/dri/i915tex/i915_metaops.c
src/mesa/drivers/dri/i915tex/i915_vtbl.c
src/mesa/drivers/dri/i915tex/intel_batchbuffer.c
src/mesa/drivers/dri/i915tex/intel_batchbuffer.h
src/mesa/drivers/dri/i915tex/intel_context.c
src/mesa/drivers/dri/i915tex/intel_context.h
src/mesa/drivers/dri/i915tex/intel_decode.c
src/mesa/drivers/dri/i915tex/intel_pixel_draw.c
src/mesa/drivers/dri/i915tex/server/i830_common.h
src/mesa/drivers/dri/i965/intel_context.c