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_program.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_program.c')
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_program.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c index caad05cb9f7..26bdc9951af 100644 --- a/src/gallium/drivers/vc4/vc4_program.c +++ b/src/gallium/drivers/vc4/vc4_program.c @@ -2043,7 +2043,7 @@ vc4_setup_shared_key(struct vc4_context *vc4, struct vc4_key *key, key->tex[i].swizzle[2] = sampler->swizzle_b; key->tex[i].swizzle[3] = sampler->swizzle_a; - if (sampler->texture->nr_samples) { + if (sampler->texture->nr_samples > 1) { key->tex[i].msaa_width = sampler->texture->width0; key->tex[i].msaa_height = sampler->texture->height0; } else if (sampler){ |