From 59dd8ad752683f6c3c8c7c787954f35df407de14 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Fri, 24 Feb 2006 15:02:41 +0000 Subject: [PATCH] Hack bmBufferData and bmBufferSubdata back into operation with an implicit map/unmap. --- src/mesa/drivers/dri/i915/bufmgr_fake.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i915/bufmgr_fake.c b/src/mesa/drivers/dri/i915/bufmgr_fake.c index 576e3f57bfe..1287ba92b2c 100644 --- a/src/mesa/drivers/dri/i915/bufmgr_fake.c +++ b/src/mesa/drivers/dri/i915/bufmgr_fake.c @@ -766,7 +766,14 @@ void bmBufferData(struct bufmgr *bm, if (data != NULL) { bmAllocMem(bm, buf, buf->flags | flags); +#if 0 memcpy(buf->block->virtual, data, size); +#else + /* Do an implicit map/unmap to get this working for now: + */ + memcpy(bmMapBuffer(bm, buf->id, flags), data, size); + bmUnmapBuffer(bm, buf->id); +#endif } } @@ -788,8 +795,16 @@ void bmBufferSubData(struct bufmgr *bm, if (buf->block->mem_type != BM_MEM_LOCAL) bmFinishFence(bm, buf->block->fence); - if (size) + if (size) { +#if 0 memcpy(buf->block->virtual + offset, data, size); +#else + /* Do an implicit map/unmap to get this working for now: + */ + memcpy(bmMapBuffer(bm, buf->id, 0) + offset, data, size); + bmUnmapBuffer(bm, buf->id); +#endif + } }