diff options
| author | Eric Anholt <[email protected]> | 2009-06-29 18:48:27 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2009-06-30 10:41:18 -0700 |
| commit | 57a06d3a48c9af1067ec05e3ad96c58f4b9b99be (patch) | |
| tree | 8c6ab07e2722d97e389d62dd4c2a8e35fa31c2b4 /src/mesa/drivers | |
| parent | b40dc7e7fcafc30ebaa3778ee847c8983987de83 (diff) | |
i915: Fix assertion failure on remapping a non-BO-backed VBO.
Failure to set the obj->Pointer back to null tripped up the assertion.
Bug #22428.
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_buffer_objects.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_buffer_objects.c b/src/mesa/drivers/dri/intel/intel_buffer_objects.c index aed0e45a28f..9408b0c351f 100644 --- a/src/mesa/drivers/dri/intel/intel_buffer_objects.c +++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.c @@ -274,7 +274,10 @@ intel_bufferobj_unmap(GLcontext * ctx, struct intel_buffer_object *intel_obj = intel_buffer_object(obj); assert(intel_obj); - if (intel_obj->buffer != NULL) { + if (intel_obj->sys_buffer != NULL) { + assert(obj->Pointer); + obj->Pointer = NULL; + } else if (intel_obj->buffer != NULL) { assert(obj->Pointer); if (intel_obj->mapped_gtt) { drm_intel_gem_bo_unmap_gtt(intel_obj->buffer); |