From b12b24a430e2d328cbe102612b8a152e5c925cbf Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 17 May 2007 15:36:43 -0700 Subject: [PATCH] Restore missing intel_batchbuffer_reset() which was needed. --- .../drivers/dri/i915tex/intel_batchbuffer.c | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c b/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c index 55e40d5d97d..67fca371a7e 100644 --- a/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c +++ b/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c @@ -80,12 +80,16 @@ intel_dump_batchbuffer(GLuint offset, GLuint * ptr, GLuint count) /*====================================================================== * Public functions */ -struct intel_batchbuffer * -intel_batchbuffer_alloc(struct intel_context *intel) +void +intel_batchbuffer_reset(struct intel_batchbuffer *batch) { - struct intel_batchbuffer *batch = calloc(sizeof(*batch), 1); + struct intel_context *intel = batch->intel; + + if (batch->buf != NULL) { + dri_bo_unreference(batch->buf); + batch->buf = NULL; + } - batch->intel = intel; batch->buf = dri_bo_alloc(intel->intelScreen->bufmgr, "batchbuffer", intel->intelScreen->maxBatchSize, 4096, DRM_BO_FLAG_MEM_TT | @@ -94,9 +98,17 @@ intel_batchbuffer_alloc(struct intel_context *intel) batch->map = batch->buf->virtual; batch->size = intel->intelScreen->maxBatchSize; batch->ptr = batch->map; +} + +struct intel_batchbuffer * +intel_batchbuffer_alloc(struct intel_context *intel) +{ + struct intel_batchbuffer *batch = calloc(sizeof(*batch), 1); + batch->intel = intel; batch->last_fence = NULL; intel_batchbuffer_reset(batch); + return batch; } -- 2.30.2