diff options
| author | Eric Anholt <[email protected]> | 2015-12-14 15:22:55 -0800 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2015-12-15 12:02:53 -0800 |
| commit | f2cf2a63f1211642ca20b73ad5f23c60cc3fa703 (patch) | |
| tree | da542ead992509df02bdc75f9daada8a1439dd99 /src/gallium/drivers/vc4/vc4_state.c | |
| parent | da92f16c500642879221b201a8292080236b4251 (diff) | |
vc4: Don't consider nr_samples==1 surfaces to be MSAA.
This is apparently a weirdness of gallium -- nr_samples==1 is occasionally
used and means the same thing as nr_samples==0. Fixes a bunch of
ARB_framebuffer_srgb blit cases in piglit.
Diffstat (limited to 'src/gallium/drivers/vc4/vc4_state.c')
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/vc4/vc4_state.c b/src/gallium/drivers/vc4/vc4_state.c index d9c0f55b23d..7e0ada7d0fa 100644 --- a/src/gallium/drivers/vc4/vc4_state.c +++ b/src/gallium/drivers/vc4/vc4_state.c @@ -462,9 +462,9 @@ vc4_set_framebuffer_state(struct pipe_context *pctx, vc4->msaa = false; if (cso->cbufs[0]) - vc4->msaa = cso->cbufs[0]->texture->nr_samples != 0; + vc4->msaa = cso->cbufs[0]->texture->nr_samples > 1; else if (cso->zsbuf) - vc4->msaa = cso->zsbuf->texture->nr_samples != 0; + vc4->msaa = cso->zsbuf->texture->nr_samples > 1; if (vc4->msaa) { vc4->tile_width = 32; |