Mesa (gallium-0.2): intel: Supply the correct buffers to gem

[Jakob Bornecrantz]

Module: Mesa
Branch: gallium-0.2
Commit: 26fe7a5fc4421d91e43885da7f85ed9d13897a06
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=26fe7a5fc4421d91e43885da7f85ed9d13897a06

Author: Jakob Bornecrantz <wallbraker at gmail.com>
Date:   Wed Jan 28 23:22:28 2009 +0100

intel: Supply the correct buffers to gem

---

 .../winsys/drm/intel/gem/intel_be_batchbuffer.c    |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gallium/winsys/drm/intel/gem/intel_be_batchbuffer.c b/src/gallium/winsys/drm/intel/gem/intel_be_batchbuffer.c
index e83a4c4..b7bc3ee 100644
--- a/src/gallium/winsys/drm/intel/gem/intel_be_batchbuffer.c
+++ b/src/gallium/winsys/drm/intel/gem/intel_be_batchbuffer.c
@@ -66,13 +66,15 @@ intel_be_offset_relocation(struct intel_be_batchbuffer *batch,
 	assert(batch->base.relocs < batch->base.max_relocs);
 
 	offset = (unsigned)(batch->base.ptr - batch->base.map);
-	batch->base.ptr += 4;
 
-	ret = drm_intel_bo_emit_reloc(bo, pre_add,
-	                              batch->bo, offset,
+	ret = drm_intel_bo_emit_reloc(batch->bo, offset,
+	                              bo, pre_add,
 	                              read_domains,
 	                              write_domain);
 
+	((uint32_t*)batch->base.ptr)[0] = bo->offset = pre_add;
+	batch->base.ptr += 4;
+
 	if (!ret)
 		batch->base.relocs++;