[Mesa-dev] [PATCH] mesa: simplify some _mesa_IsEnabled() queries

[Matt Turner]

On Mon, Jul 1, 2013 at 7:58 AM, Brian Paul <brianp at vmware.com> wrote:
> No need to test array->Enabled != 0 since the Enabled field can
> only be 0 or 1.
> ---
>  src/mesa/main/enable.c |   21 +++++++++++----------
>  1 file changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
> index 5c72b3c..21e5931 100644
> --- a/src/mesa/main/enable.c
> +++ b/src/mesa/main/enable.c
> @@ -1395,40 +1395,41 @@ _mesa_IsEnabled( GLenum cap )
>        case GL_VERTEX_ARRAY:
>           if (ctx->API != API_OPENGL_COMPAT && ctx->API != API_OPENGLES)
>              goto invalid_enum_error;
> -         return (ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_POS].Enabled != 0);
> +         return ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_POS].Enabled;
>        case GL_NORMAL_ARRAY:
>           if (ctx->API != API_OPENGL_COMPAT && ctx->API != API_OPENGLES)
>              goto invalid_enum_error;
> -         return (ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_NORMAL].Enabled != 0);
> +         return ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_NORMAL].Enabled;
>        case GL_COLOR_ARRAY:
>           if (ctx->API != API_OPENGL_COMPAT && ctx->API != API_OPENGLES)
>              goto invalid_enum_error;
> -         return (ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_COLOR0].Enabled != 0);
> +         return ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_COLOR0].Enabled;
>        case GL_INDEX_ARRAY:
>           if (ctx->API != API_OPENGL_COMPAT)
>              goto invalid_enum_error;
> -         return (ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_COLOR_INDEX].Enabled != 0);
> +         return ctx->Array.ArrayObj->
> +            VertexAttrib[VERT_ATTRIB_COLOR_INDEX].Enabled;
>        case GL_TEXTURE_COORD_ARRAY:
>           if (ctx->API != API_OPENGL_COMPAT && ctx->API != API_OPENGLES)
>              goto invalid_enum_error;
> -         return (ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_TEX(ctx->Array.ActiveTexture)]
> -                 .Enabled != 0);
> +         return ctx->Array.ArrayObj->
> +            VertexAttrib[VERT_ATTRIB_TEX(ctx->Array.ActiveTexture)].Enabled;
>        case GL_EDGE_FLAG_ARRAY:
>           if (ctx->API != API_OPENGL_COMPAT)
>              goto invalid_enum_error;
> -         return (ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_EDGEFLAG].Enabled != 0);
> +         return ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_EDGEFLAG].Enabled;
>        case GL_FOG_COORDINATE_ARRAY_EXT:
>           if (ctx->API != API_OPENGL_COMPAT)
>              goto invalid_enum_error;
> -         return (ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_FOG].Enabled != 0);
> +         return ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_FOG].Enabled;
>        case GL_SECONDARY_COLOR_ARRAY_EXT:
>           if (ctx->API != API_OPENGL_COMPAT)
>              goto invalid_enum_error;
> -         return (ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_COLOR1].Enabled != 0);
> +         return ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_COLOR1].Enabled;
>        case GL_POINT_SIZE_ARRAY_OES:
>           if (ctx->API != API_OPENGLES)
>              goto invalid_enum_error;
> -         return (ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_POINT_SIZE].Enabled != 0);
> +         return ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_POINT_SIZE].Enabled;
>
>        /* GL_ARB_texture_cube_map */
>        case GL_TEXTURE_CUBE_MAP_ARB:
> --
> 1.7.10.4

Reviewed-by: Matt Turner <mattst88 at gmail.com>