diff options
author | Marek Olšák <marek.olsak@amd.com> | 2019-01-11 15:11:30 -0500 |
---|---|---|
committer | Emil Velikov <emil.l.velikov@gmail.com> | 2019-01-29 17:44:27 +0000 |
commit | ae91c29a25c1aa793cd32af927888e5118974d6f (patch) | |
tree | 87061cd5290cd9d5b4d6f27b143a3030f9d06a39 | |
parent | b6cd30de3a4c7b5b0195bd03535753860f1620a9 (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>
(cherry picked from commit caa2dcd7309311c3f707b1855c7e30c1c72818e2)
-rw-r--r-- | src/gallium/drivers/radeonsi/si_state_shaders.c | 2 |
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 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; |