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.
(cherry picked from commit 57a06d3a48)
This commit is contained in:
@@ -265,7 +265,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);
|
||||
|
||||
Reference in New Issue
Block a user