31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From e2a696a4cd93c2dbe445243de48ed478fbdb8009 Mon Sep 17 00:00:00 2001
|
|
From: Chris Wilson <chris@chris-wilson.co.uk>
|
|
Date: Fri, 10 Jul 2015 10:41:35 +0100
|
|
Subject: i965: Remove early release of DRI2 miptree
|
|
|
|
intel_update_winsys_renderbuffer_miptree() will release the existing
|
|
miptree when wrapping a new DRI2 buffer, so we can remove the early
|
|
release and so prevent a NULL mt dereference should importing the new
|
|
DRI2 name fail for any reason. (Reusing the old DRI2 name will result
|
|
in the rendering going astray, to a stale buffer, and not shown on the
|
|
screen, but it allows us to issue a warning and not crash much later in
|
|
innocent code.)
|
|
|
|
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
|
|
|
|
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
|
|
index e8d1396..72f3897 100644
|
|
--- a/src/mesa/drivers/dri/i965/brw_context.c
|
|
+++ b/src/mesa/drivers/dri/i965/brw_context.c
|
|
@@ -1388,7 +1388,6 @@ intel_process_dri2_buffer(struct brw_context *brw,
|
|
buffer->cpp, buffer->pitch);
|
|
}
|
|
|
|
- intel_miptree_release(&rb->mt);
|
|
bo = drm_intel_bo_gem_create_from_name(brw->bufmgr, buffer_name,
|
|
buffer->name);
|
|
if (!bo) {
|
|
--
|
|
cgit v0.10.2
|
|
|