summaryrefslogtreecommitdiff
path: root/lib/mesa/src/gallium/auxiliary/util/u_framebuffer.c
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2021-07-22 10:17:30 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2021-07-22 10:17:30 +0000
commitca11beabae33eb59fb981b8adf50b1d47a2a98f0 (patch)
tree3e4691a396e6e54cd54224a190663d5cf976625b /lib/mesa/src/gallium/auxiliary/util/u_framebuffer.c
parent27c8a50e8bbde7d28b1fc46d715a4c469e24f2c4 (diff)
Import Mesa 21.1.5
Diffstat (limited to 'lib/mesa/src/gallium/auxiliary/util/u_framebuffer.c')
-rw-r--r--lib/mesa/src/gallium/auxiliary/util/u_framebuffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mesa/src/gallium/auxiliary/util/u_framebuffer.c b/lib/mesa/src/gallium/auxiliary/util/u_framebuffer.c
index f56951139..36b6c14a4 100644
--- a/lib/mesa/src/gallium/auxiliary/util/u_framebuffer.c
+++ b/lib/mesa/src/gallium/auxiliary/util/u_framebuffer.c
@@ -244,7 +244,7 @@ util_framebuffer_get_num_samples(const struct pipe_framebuffer_state *fb)
fb->zsbuf->nr_samples);
}
- return 1;
+ return MAX2(fb->samples, 1);
}