From ae91c29a25c1aa793cd32af927888e5118974d6f Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Fri, 11 Jan 2019 15:11:30 -0500 Subject: 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 (cherry picked from commit caa2dcd7309311c3f707b1855c7e30c1c72818e2) --- src/gallium/drivers/radeonsi/si_state_shaders.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index ad7d21e7816..950fb41a557 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -1662,7 +1662,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; -- cgit v1.2.3