summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2015-12-14 15:31:40 -0800
committerEric Anholt <[email protected]>2015-12-15 12:02:53 -0800
commitc5b886b02829adc58a60453c57b00c2e8d6265f0 (patch)
treeb851ae4c416c41400d626ff203c9b4781a17562c
parentf2cf2a63f1211642ca20b73ad5f23c60cc3fa703 (diff)
vc4: Only update vc4->msaa when the framebuffer changes.
Any update here should have been the same as in vc4_set_framebuffer_state(), except for the point where vc4_blit.c temporarily sets different state for its different buffers.
-rw-r--r--src/gallium/drivers/vc4/vc4_context.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/gallium/drivers/vc4/vc4_context.c b/src/gallium/drivers/vc4/vc4_context.c
index 0f6b9714929..312b006f96e 100644
--- a/src/gallium/drivers/vc4/vc4_context.c
+++ b/src/gallium/drivers/vc4/vc4_context.c
@@ -67,7 +67,6 @@ vc4_flush(struct pipe_context *pctx)
cl_u8(&bcl, VC4_PACKET_FLUSH);
cl_end(&vc4->bcl, bcl);
- vc4->msaa = false;
if (cbuf && (vc4->resolve & PIPE_CLEAR_COLOR0)) {
pipe_surface_reference(&vc4->color_write,
cbuf->texture->nr_samples > 1 ?
@@ -76,9 +75,6 @@ vc4_flush(struct pipe_context *pctx)
cbuf->texture->nr_samples > 1 ?
cbuf : NULL);
- if (cbuf->texture->nr_samples > 1)
- vc4->msaa = true;
-
if (!(vc4->cleared & PIPE_CLEAR_COLOR0)) {
pipe_surface_reference(&vc4->color_read, cbuf);
} else {
@@ -100,9 +96,6 @@ vc4_flush(struct pipe_context *pctx)
zsbuf->texture->nr_samples > 1 ?
zsbuf : NULL);
- if (zsbuf->texture->nr_samples > 1)
- vc4->msaa = true;
-
if (!(vc4->cleared & (PIPE_CLEAR_DEPTH | PIPE_CLEAR_STENCIL))) {
pipe_surface_reference(&vc4->zs_read, zsbuf);
} else {