aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2019-01-11 15:11:30 -0500
committerMarek Olšák <marek.olsak@amd.com>2019-01-22 11:59:27 -0500
commitcaa2dcd7309311c3f707b1855c7e30c1c72818e2 (patch)
treed1634b447bc018d73ee11d74ea6dd33aad202395
parentc02f761bdfc87d0a1bfdc37b83b7a26cebc59879 (diff)
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>
-rw-r--r--src/gallium/drivers/radeonsi/si_state_shaders.c2
1 files changed, 1 insertions, 1 deletions
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;