From: Anuj Phogat Date: Mon, 1 Jan 2001 00:05:42 +0000 (-0800) Subject: meta: Do power of two samples check only for samples > 0 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0a4ea87344a1cbca4c50cfca1efe97202aa18be8;p=mesa.git meta: Do power of two samples check only for samples > 0 otherwise samples=0 passes the check, which is invalid. Signed-off-by: Anuj Phogat Reviewed-by: Neil Roberts --- diff --git a/src/mesa/drivers/common/meta_blit.c b/src/mesa/drivers/common/meta_blit.c index 3406be1ed1c..971a2ff1deb 100644 --- a/src/mesa/drivers/common/meta_blit.c +++ b/src/mesa/drivers/common/meta_blit.c @@ -82,7 +82,7 @@ setup_glsl_msaa_blit_scaled_shader(struct gl_context *ctx, y_scale = samples * 0.5; /* We expect only power of 2 samples in source multisample buffer. */ - assert((samples & (samples - 1)) == 0); + assert(samples > 0 && (samples & (samples - 1)) == 0); while (samples >> (shader_offset + 1)) { shader_offset++; } @@ -261,7 +261,7 @@ setup_glsl_msaa_blit_shader(struct gl_context *ctx, } /* We expect only power of 2 samples in source multisample buffer. */ - assert((samples & (samples - 1)) == 0); + assert(samples > 0 && (samples & (samples - 1)) == 0); while (samples >> (shader_offset + 1)) { shader_offset++; }