OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel: Move note_unlock() implementation to the one place it's needed.

Browse Source
This commit is contained in:
Eric Anholt
2009-06-29 09:55:17 -07:00
parent de447afff2
commit 94008088c1
6 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mesa/drivers/dri/i915/i830_vtbl.c
View File

@@ -737,12 +737,6 @@ i830_assert_not_dirty( struct intel_context *intel )
assert(!get_dirty(state)); assert(!get_dirty(state));
} }
static void
i830_note_unlock( struct intel_context *intel )
{
/* nothing */
}
void void
i830InitVtbl(struct i830_context *i830) i830InitVtbl(struct i830_context *i830)
{ {
@@ -757,6 +751,5 @@ i830InitVtbl(struct i830_context *i830)
i830->intel.vtbl.render_start = i830_render_start; i830->intel.vtbl.render_start = i830_render_start;
i830->intel.vtbl.render_prevalidate = i830_render_prevalidate; i830->intel.vtbl.render_prevalidate = i830_render_prevalidate;
i830->intel.vtbl.assert_not_dirty = i830_assert_not_dirty; i830->intel.vtbl.assert_not_dirty = i830_assert_not_dirty;
i830->intel.vtbl.note_unlock = i830_note_unlock;
i830->intel.vtbl.finish_batch = intel_finish_vb; i830->intel.vtbl.finish_batch = intel_finish_vb;
} }

8
src/mesa/drivers/dri/i915/i915_vtbl.c
View File

@@ -692,13 +692,6 @@ i915_assert_not_dirty( struct intel_context *intel )
assert(!dirty); assert(!dirty);
} }
static void
i915_note_unlock( struct intel_context *intel )
{
/* nothing */
}
void void
i915InitVtbl(struct i915_context *i915) i915InitVtbl(struct i915_context *i915)
{ {
@@ -713,6 +706,5 @@ i915InitVtbl(struct i915_context *i915)
i915->intel.vtbl.update_texture_state = i915UpdateTextureState; i915->intel.vtbl.update_texture_state = i915UpdateTextureState;
i915->intel.vtbl.flush_cmd = i915_flush_cmd; i915->intel.vtbl.flush_cmd = i915_flush_cmd;
i915->intel.vtbl.assert_not_dirty = i915_assert_not_dirty; i915->intel.vtbl.assert_not_dirty = i915_assert_not_dirty;
i915->intel.vtbl.note_unlock = i915_note_unlock;
i915->intel.vtbl.finish_batch = intel_finish_vb; i915->intel.vtbl.finish_batch = intel_finish_vb;
} }

2
src/mesa/drivers/dri/i965/brw_draw.c
View File

@@ -416,6 +416,8 @@ static GLboolean brw_try_draw_prims( GLcontext *ctx,
out: out:
UNLOCK_HARDWARE(intel); UNLOCK_HARDWARE(intel);
brw_state_cache_check_size(brw);
if (warn) if (warn)
fprintf(stderr, "i965: Single primitive emit potentially exceeded " fprintf(stderr, "i965: Single primitive emit potentially exceeded "
"available aperture space\n"); "available aperture space\n");

9
src/mesa/drivers/dri/i965/brw_vtbl.c
View File

@@ -177,14 +177,6 @@ static void brw_note_fence( struct intel_context *intel, GLuint fence )
brw_context(&intel->ctx)->state.dirty.brw |= BRW_NEW_FENCE; brw_context(&intel->ctx)->state.dirty.brw |= BRW_NEW_FENCE;
} }
static void brw_note_unlock( struct intel_context *intel )
{
struct brw_context *brw = brw_context(&intel->ctx);
brw_state_cache_check_size(brw);
}
/* called from intelWaitForIdle() and intelFlush() /* called from intelWaitForIdle() and intelFlush()
* *
* For now, just flush everything. Could be smarter later. * For now, just flush everything. Could be smarter later.
@@ -215,7 +207,6 @@ void brwInitVtbl( struct brw_context *brw )
brw->intel.vtbl.invalidate_state = brw_invalidate_state; brw->intel.vtbl.invalidate_state = brw_invalidate_state;
brw->intel.vtbl.note_fence = brw_note_fence; brw->intel.vtbl.note_fence = brw_note_fence;
brw->intel.vtbl.note_unlock = brw_note_unlock;
brw->intel.vtbl.new_batch = brw_new_batch; brw->intel.vtbl.new_batch = brw_new_batch;
brw->intel.vtbl.finish_batch = brw_finish_batch; brw->intel.vtbl.finish_batch = brw_finish_batch;
brw->intel.vtbl.destroy = brw_destroy_context; brw->intel.vtbl.destroy = brw_destroy_context;

1
src/mesa/drivers/dri/intel/intel_context.c
View File

@@ -1097,7 +1097,6 @@ void UNLOCK_HARDWARE( struct intel_context *intel )
{ {
__DRIscreen *sPriv = intel->driScreen; __DRIscreen *sPriv = intel->driScreen;
intel->vtbl.note_unlock( intel );
intel->locked--; intel->locked--;
if (intel->locked > 0) if (intel->locked > 0)
return; return;

1
src/mesa/drivers/dri/intel/intel_context.h
View File

@@ -91,7 +91,6 @@ struct intel_context
void (*new_batch) (struct intel_context * intel); void (*new_batch) (struct intel_context * intel);
void (*emit_invarient_state) (struct intel_context * intel); void (*emit_invarient_state) (struct intel_context * intel);
void (*note_fence) (struct intel_context *intel, GLuint fence); void (*note_fence) (struct intel_context *intel, GLuint fence);
void (*note_unlock) (struct intel_context *intel);
void (*update_texture_state) (struct intel_context * intel); void (*update_texture_state) (struct intel_context * intel);
void (*render_start) (struct intel_context * intel); void (*render_start) (struct intel_context * intel);