KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel: fix the issue "VBO: Cannot allocate memory for a BO" on 

965 after merging intel_context.c from i915 and i965. fix bug# 15152.
This commit is contained in:
Xiang, Haihao 2008-03-25 17:29:08 +08:00
parent 816fbeaa81
commit 0e34dcc6df
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -666,6 +666,11 @@ i830_assert_not_dirty( struct intel_context *intel )
assert(!get_dirty(state));
}
static void
i830_note_unlock( struct intel_context *intel )
{
/* nothing */
}
void
i830InitVtbl(struct i830_context *i830)
@ -681,4 +686,5 @@ i830InitVtbl(struct i830_context *i830)
i830->intel.vtbl.render_start = i830_render_start;
i830->intel.vtbl.render_prevalidate = i830_render_prevalidate;
i830->intel.vtbl.assert_not_dirty = i830_assert_not_dirty;
i830->intel.vtbl.note_unlock = i830_note_unlock;
}

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

@ -572,6 +572,12 @@ i915_assert_not_dirty( struct intel_context *intel )
assert(!dirty);
}
static void
i915_note_unlock( struct intel_context *intel )
{
/* nothing */
}
void
i915InitVtbl(struct i915_context *i915)
@ -587,4 +593,5 @@ i915InitVtbl(struct i915_context *i915)
i915->intel.vtbl.update_texture_state = i915UpdateTextureState;
i915->intel.vtbl.flush_cmd = i915_flush_cmd;
i915->intel.vtbl.assert_not_dirty = i915_assert_not_dirty;
i915->intel.vtbl.note_unlock = i915_note_unlock;
}

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

@ -993,6 +993,7 @@ void LOCK_HARDWARE( struct intel_context *intel )
*/
void UNLOCK_HARDWARE( struct intel_context *intel )
{
intel->vtbl.note_unlock( intel );
intel->locked = 0;
DRM_UNLOCK(intel->driFd, intel->driHwLock, intel->hHWContext);