diff options
author | Eric Anholt <eric@anholt.net> | 2007-09-19 11:05:36 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2007-09-20 09:04:20 -0700 |
commit | 4f1c9f7e510122b32c82ee9adbdb4987dae27afe (patch) | |
tree | 30cb409cf46cd11a6a14178985f7c69468e5b0f9 /src/mesa/drivers/dri/i915tex/intel_batchbuffer.c | |
parent | e3745dac59602a9d21b49d602646de5aef95075f (diff) | |
parent | 45899a494c578d406b29e5ee17c0f1b6bf12c2de (diff) |
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
Diffstat (limited to 'src/mesa/drivers/dri/i915tex/intel_batchbuffer.c')
-rw-r--r-- | src/mesa/drivers/dri/i915tex/intel_batchbuffer.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c b/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c index 5aabef96ae..5515d6c235 100644 --- a/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c +++ b/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c @@ -27,7 +27,8 @@ #include "intel_batchbuffer.h" #include "intel_ioctl.h" -#include "i915_disasm.h" +#include "intel_decode.h" +#include "i915_debug.h" /* Relocations in kernel space: * - pass dma buffer seperately @@ -67,9 +68,6 @@ * modifying cliprects ??? */ -/*====================================================================== - * Public functions - */ void intel_batchbuffer_reset(struct intel_batchbuffer *batch) { @@ -197,7 +195,7 @@ do_flush_locked(struct intel_batchbuffer *batch, if (INTEL_DEBUG & DEBUG_BATCH) { dri_bo_map(batch->buf, GL_FALSE); - i915_disasm(ptr, used / 4, batch->buf->offset); + intel_decode(ptr, used / 4, batch->buf->offset); dri_bo_unmap(batch->buf); } } |