Attachment 144143 Details for Bug 110601 – Hack for issue (2), irb->mt == NULL

[patch] Hack for issue (2), irb->mt == NULL

0002-i965-handle-missing-irb-mt-properly.patch (text/plain), 2.58 KB, created by Anssi Hannula on 2019-05-03 14:10:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anssi Hannula

Created: 2019-05-03 14:10:48 UTC

Size: 2.58 KB

patch

obsolete

>From 26882a5fd6b0ac74da5f0a53935a641794d1046d Mon Sep 17 00:00:00 2001
>From: Anssi Hannula <anssi.hannula@bitwise.fi>
>Date: Fri, 3 May 2019 15:14:16 +0300
>Subject: [PATCH 2/2] i965: handle missing irb->mt properly
>
>If intel_update_winsys_renderbuffer_miptree() fails, irb->mt will be
>NULL but many users assume it is non-NULL.
>
>Add NULL checks to several places.
>
>I presume a proper way to do this would be to avoid having a valid irb
>with invalid irb->mt on the error case, instead.
>
>Signed-off-by: Anssi Hannula <anssi.hannula@bitwise.fi>
>---
> src/mesa/drivers/dri/i965/brw_blorp.c            | 4 ++++
> src/mesa/drivers/dri/i965/brw_draw.c             | 2 +-
> src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 2 +-
> 3 files changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c b/src/mesa/drivers/dri/i965/brw_blorp.c
>index 9a38a365199..05f316eb03a 100644
>--- a/src/mesa/drivers/dri/i965/brw_blorp.c
>+++ b/src/mesa/drivers/dri/i965/brw_blorp.c
>@@ -1376,6 +1376,10 @@ brw_blorp_clear_color(struct brw_context *brw, struct gl_framebuffer *fb,
>       if (rb == NULL)
>          continue;
> 
>+      /* miptree creation could have failed */
>+      if (irb->mt == NULL)
>+         continue;
>+
>       do_single_blorp_clear(brw, fb, rb, buf, partial_clear, encode_srgb);
>       irb->need_downsample = true;
>    }
>diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
>index d07349419cc..e0fb4c73f4f 100644
>--- a/src/mesa/drivers/dri/i965/brw_draw.c
>+++ b/src/mesa/drivers/dri/i965/brw_draw.c
>@@ -728,7 +728,7 @@ brw_postdraw_set_buffers_need_resolve(struct brw_context *brw)
>       struct intel_renderbuffer *irb =
>          intel_renderbuffer(fb->_ColorDrawBuffers[i]);
> 
>-      if (!irb)
>+      if (!irb || !irb->mt)
>          continue;
> 
>       mesa_format mesa_format =
>diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
>index 8175fbf0db4..a9e3323a170 100644
>--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
>+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
>@@ -1020,7 +1020,7 @@ update_renderbuffer_surfaces(struct brw_context *brw)
>       for (unsigned i = 0; i < fb->_NumColorDrawBuffers; i++) {
>          struct gl_renderbuffer *rb = fb->_ColorDrawBuffers[i];
> 
>-	 if (intel_renderbuffer(rb)) {
>+         if (intel_renderbuffer(rb) && intel_renderbuffer(rb)->mt) {
>             surf_offsets[rt_start + i] = devinfo->gen >= 6 ?
>                gen6_update_renderbuffer_surface(brw, rb, i, rt_start + i) :
>                gen4_update_renderbuffer_surface(brw, rb, i, rt_start + i);
>-- 
>2.17.2
>

Actions: View | Splinter Review

Attachments on bug 110601: 144142 | 144143 | 144144 | 144145 | 144146

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.