From: Marek Olšák <marek.olsak@amd.com>
Date: Fri, 11 Jan 2019 20:11:30 +0000 (-0500)
Subject: radeonsi: fix a u_blitter crash after a shader with FBFETCH
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=caa2dcd7309311c3f707b1855c7e30c1c72818e2;p=mesa.git

radeonsi: fix a u_blitter crash after a shader with FBFETCH

This fixes an assertion failure with GL CTS when cts-runner is used.
(not a specific test)

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108877
Cc: 18.3 <mesa-stable@lists.freedesktop.org>
---

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index 2adae673808..007175d3bbe 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -1657,7 +1657,7 @@ static inline void si_shader_selector_key(struct pipe_context *ctx,
 		key->part.ps.epilog.alpha_func = si_get_alpha_test_func(sctx);
 
 		/* ps_uses_fbfetch is true only if the color buffer is bound. */
-		if (sctx->ps_uses_fbfetch) {
+		if (sctx->ps_uses_fbfetch && !sctx->blitter->running) {
 			struct pipe_surface *cb0 = sctx->framebuffer.state.cbufs[0];
 			struct pipe_resource *tex = cb0->texture;