NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

i965: Move annotate_aub out of the vtable.

Browse source 
brw_annotate_aub() is the only implementation of this function, so it
makes sense to just call it directly.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
This commit is contained in:
Kenneth Graunke 2013-07-02 01:19:23 -07:00
parent f05f8793c8
commit 2c602d2adf
3 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/mesa/drivers/dri/i965/brw_vtbl.c
View file

@ -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) {

4
src/mesa/drivers/dri/i965/intel_batchbuffer.c
View file

@ -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);

2
src/mesa/drivers/dri/i965/intel_context.h
View file

@ -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,