summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Brezillon <[email protected]>2019-08-02 19:18:45 +0200
committerBoris Brezillon <[email protected]>2019-08-02 21:54:58 +0200
commit8227d284f7f7bbaf795c04b6d1e7081f7fb0f535 (patch)
tree0c634f575c313d8e7e5fdfa05638bff3e874e11c
parent95507a3dd4536a5abacba3f8f302066f96fe2a5e (diff)
panfrost: Don't emit a new FB desc when setting a new FB state
The FB desc will be emitted/attached on the first draw targetting this new FB. Signed-off-by: Boris Brezillon <[email protected]> Reviewed-by: Alyssa Rosenzweig <[email protected]>
-rw-r--r--src/gallium/drivers/panfrost/pan_context.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c
index a6412de7646..85b9d4d41ce 100644
--- a/src/gallium/drivers/panfrost/pan_context.c
+++ b/src/gallium/drivers/panfrost/pan_context.c
@@ -2384,6 +2384,9 @@ panfrost_set_framebuffer_state(struct pipe_context *pctx,
if (!is_scanout || has_draws)
panfrost_flush(pctx, NULL, PIPE_FLUSH_END_OF_FRAME);
+ else
+ assert(!ctx->payloads[PIPE_SHADER_VERTEX].postfix.framebuffer &&
+ !ctx->payloads[PIPE_SHADER_FRAGMENT].postfix.framebuffer);
/* Invalidate the FBO job cache since we've just been assigned a new
* FB state.
@@ -2396,7 +2399,8 @@ panfrost_set_framebuffer_state(struct pipe_context *pctx,
struct panfrost_screen *screen = pan_screen(ctx->base.screen);
panfrost_hint_afbc(screen, &ctx->pipe_framebuffer);
- panfrost_attach_vt_framebuffer(ctx, false);
+ for (unsigned i = 0; i < PIPE_SHADER_TYPES; ++i)
+ ctx->payloads[i].postfix.framebuffer = 0;
}
static void *