diff options
| author | Kenneth Graunke <[email protected]> | 2013-07-02 01:19:23 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2013-07-03 10:48:14 -0700 |
| commit | 2c602d2adff5bbe2954fdde63adcea63c2a499ed (patch) | |
| tree | bec9c86bb2b9103f2596d293bbb78ccbc0f6f3ec /src | |
| parent | f05f8793c83c05a42eb74fc086b51e01a6b631b7 (diff) | |
i965: Move annotate_aub out of the vtable.
brw_annotate_aub() is the only implementation of this function, so it
makes sense to just call it directly.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Chad Versace <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vtbl.c | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_batchbuffer.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_context.h | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vtbl.c b/src/mesa/drivers/dri/i965/brw_vtbl.c index fbf38f29b9e..f9a541fa636 100644 --- a/src/mesa/drivers/dri/i965/brw_vtbl.c +++ b/src/mesa/drivers/dri/i965/brw_vtbl.c @@ -159,7 +159,6 @@ void brwInitVtbl( struct brw_context *brw ) brw->intel.vtbl.new_batch = brw_new_batch; brw->intel.vtbl.finish_batch = brw_finish_batch; brw->intel.vtbl.destroy = brw_destroy_context; - brw->intel.vtbl.annotate_aub = brw_annotate_aub; assert(brw->intel.gen >= 4); if (brw->intel.gen >= 7) { diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c index b782966ac2d..46f17fd1927 100644 --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c +++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c @@ -203,8 +203,8 @@ do_flush_locked(struct intel_context *intel) flags |= I915_EXEC_GEN7_SOL_RESET; if (ret == 0) { - if (unlikely(INTEL_DEBUG & DEBUG_AUB) && intel->vtbl.annotate_aub) - intel->vtbl.annotate_aub(intel); + if (unlikely(INTEL_DEBUG & DEBUG_AUB)) + brw_annotate_aub(intel); if (intel->hw_ctx == NULL || batch->is_blit) { ret = drm_intel_bo_mrb_exec(batch->bo, 4 * batch->used, NULL, 0, 0, flags); diff --git a/src/mesa/drivers/dri/i965/intel_context.h b/src/mesa/drivers/dri/i965/intel_context.h index d3e09b73adc..5fd9ccd1aeb 100644 --- a/src/mesa/drivers/dri/i965/intel_context.h +++ b/src/mesa/drivers/dri/i965/intel_context.h @@ -119,8 +119,6 @@ struct intel_context void (*finish_batch) (struct intel_context * intel); void (*new_batch) (struct intel_context * intel); - void (*annotate_aub)(struct intel_context *intel); - void (*update_texture_surface)(struct gl_context *ctx, unsigned unit, uint32_t *binding_table, |