[Mesa-stable] [PATCH] mesa: Indent break statements and add a missing one.

Emil Velikov emil.l.velikov at gmail.com
Tue Mar 3 18:01:02 PST 2015


On 28 February 2015 at 19:02, Matt Turner <mattst88 at gmail.com> wrote:
> Always indenting break statements makes spotting missing ones easier.
>
> Cc: 10.5 <mesa-stable at lists.freedesktop.org>
> ---
>  src/mesa/main/pack.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/src/mesa/main/pack.c b/src/mesa/main/pack.c
> index 3b77c49..f723608 100644
> --- a/src/mesa/main/pack.c
> +++ b/src/mesa/main/pack.c
> @@ -1487,20 +1487,20 @@ _mesa_pack_luminance_from_rgba_integer(GLuint n,
>           case GL_UNSIGNED_BYTE: {
>              GLbyte *dst = (GLbyte *) dstAddr;
>              dst[i] = lum32;
> +            break;
>           }
> -         break;
>           case GL_SHORT:
>           case GL_UNSIGNED_SHORT: {
>              GLshort *dst = (GLshort *) dstAddr;
>              dst[i] = lum32;
> +            break;
>           }
> -         break;
>           case GL_INT:
>           case GL_UNSIGNED_INT: {
>              GLint *dst = (GLint *) dstAddr;
>              dst[i] = lum32;
> +            break;
>           }
> -         break;
>           }
>        }
>        return;
> @@ -1525,21 +1525,22 @@ _mesa_pack_luminance_from_rgba_integer(GLuint n,
>              GLbyte *dst = (GLbyte *) dstAddr;
>              dst[2*i] = lum32;
>              dst[2*i+1] = alpha;
> +            break;
>           }
>           case GL_SHORT:
>           case GL_UNSIGNED_SHORT: {
>              GLshort *dst = (GLshort *) dstAddr;
>              dst[i] = lum32;
>              dst[2*i+1] = alpha;
> +            break;
>           }
> -         break;
>           case GL_INT:
>           case GL_UNSIGNED_INT: {
>              GLint *dst = (GLint *) dstAddr;
>              dst[i] = lum32;
>              dst[2*i+1] = alpha;
> +            break;
>           }
> -         break;
>           }
>        }
>        return;
> --
Hi Matt,

Seems like you've added 10.4 to the list before pushing. Upon closer
looks it seems that this addresses Iago and others' formats rework.
The latter of which never made it in 10.4. Can you confirm if we want
this for 10.4 ?

Thanks
Emil


More information about the mesa-stable mailing list