diff options
author | Eric Anholt <eric@anholt.net> | 2007-08-16 14:36:35 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2007-08-16 14:37:26 -0700 |
commit | b6ad5e7de8dc84ee42eeeb62d2112f096413b335 (patch) | |
tree | 25fdfa33c74e184adfb44e181e761be55ca5d549 /src/mesa/drivers/dri/i915tex | |
parent | 64297acf9e96353fe724362248246acaf0be8cb8 (diff) |
Move i915_disasm to later so we can use the hardware offset.
Diffstat (limited to 'src/mesa/drivers/dri/i915tex')
-rw-r--r-- | src/mesa/drivers/dri/i915tex/intel_batchbuffer.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c b/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c index 1edbb618d3..5aabef96ae 100644 --- a/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c +++ b/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c @@ -27,6 +27,7 @@ #include "intel_batchbuffer.h" #include "intel_ioctl.h" +#include "i915_disasm.h" /* Relocations in kernel space: * - pass dma buffer seperately @@ -144,9 +145,6 @@ do_flush_locked(struct intel_batchbuffer *batch, dri_bo_unreference(r->buf); } - if (INTEL_DEBUG & DEBUG_BATCH) - i915_disasm(ptr, used / 4, 0); - dri_bo_unmap(batch->buf); batch->map = NULL; batch->ptr = NULL; @@ -196,6 +194,12 @@ do_flush_locked(struct intel_batchbuffer *batch, } intel->vtbl.lost_hardware(intel); } + + if (INTEL_DEBUG & DEBUG_BATCH) { + dri_bo_map(batch->buf, GL_FALSE); + i915_disasm(ptr, used / 4, batch->buf->offset); + dri_bo_unmap(batch->buf); + } } |