From: Marek Olšák <maraeo@gmail.com>
Date: Mon, 15 Jul 2013 01:53:09 +0000 (+0200)
Subject: r300g/swtcl: fix a lockup in MSAA resolve
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7969b567bd4361b44ead6ed5eb86218769a025be;p=mesa.git

r300g/swtcl: fix a lockup in MSAA resolve

Cc: mesa-stable@lists.freedesktop.org
---

diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c
index 5416c3a7495..175b83a1ace 100644
--- a/src/gallium/drivers/r300/r300_render.c
+++ b/src/gallium/drivers/r300/r300_render.c
@@ -1122,6 +1122,13 @@ void r300_blitter_draw_rectangle(struct blitter_context *blitter,
     static const union pipe_color_union zeros;
     CS_LOCALS(r300);
 
+    /* XXX workaround for a lockup in MSAA resolve on SWTCL chipsets, this
+     * function most probably doesn't handle type=NONE correctly */
+    if (!r300->screen->caps.has_tcl && type == UTIL_BLITTER_ATTRIB_NONE) {
+        util_blitter_draw_rectangle(blitter, x1, y1, x2, y2, depth, type, attrib);
+        return;
+    }
+
     if (r300->skip_rendering)
         return;