diff options
| author | Iago Toral Quiroga <[email protected]> | 2017-01-03 08:39:27 +0100 |
|---|---|---|
| committer | Iago Toral Quiroga <[email protected]> | 2017-01-04 08:14:26 +0100 |
| commit | ba30e0ca20c1e25e076da7f0779f71da563cf2f9 (patch) | |
| tree | ecb0ea09c8dcaecd99b0abf5b2b54ce3e7a8f0f6 | |
| parent | 1daa31d8a877a846393c827813324f0a38cf91b6 (diff) | |
i965: make intel_batchbuffer_free() take a batchbuffer as argument
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_batchbuffer.c | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_batchbuffer.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 45490a0f5cf..f248fac6181 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -1199,7 +1199,7 @@ intelDestroyContext(__DRIcontext * driContextPriv) _swrast_DestroyContext(&brw->ctx); brw_fini_pipe_control(brw); - intel_batchbuffer_free(brw); + intel_batchbuffer_free(&brw->batch); drm_intel_bo_unreference(brw->throttle_batch[1]); drm_intel_bo_unreference(brw->throttle_batch[0]); diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c index 9a3782000a6..71e0ed08da4 100644 --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c +++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c @@ -99,11 +99,11 @@ intel_batchbuffer_reset_to_saved(struct brw_context *brw) } void -intel_batchbuffer_free(struct brw_context *brw) +intel_batchbuffer_free(struct intel_batchbuffer *batch) { - free(brw->batch.cpu_map); - drm_intel_bo_unreference(brw->batch.last_bo); - drm_intel_bo_unreference(brw->batch.bo); + free(batch->cpu_map); + drm_intel_bo_unreference(batch->last_bo); + drm_intel_bo_unreference(batch->bo); } void diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.h b/src/mesa/drivers/dri/i965/intel_batchbuffer.h index aca8fa1665b..d0ddf75866c 100644 --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.h +++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.h @@ -40,7 +40,7 @@ struct intel_batchbuffer; void intel_batchbuffer_emit_render_ring_prelude(struct brw_context *brw); void intel_batchbuffer_init(struct brw_context *brw); -void intel_batchbuffer_free(struct brw_context *brw); +void intel_batchbuffer_free(struct intel_batchbuffer *batch); void intel_batchbuffer_save_state(struct brw_context *brw); void intel_batchbuffer_reset_to_saved(struct brw_context *brw); void intel_batchbuffer_require_space(struct brw_context *brw, GLuint sz, |