[Mesa-dev] [PATCH] mesa: check constant before null check

[Brian Paul]

On 05/21/2014 06:12 AM, Timothy Arceri wrote:
> For most drivers this if statement is always going to fail so check the constant value first.
>
> Signed-off-by: Timothy Arceri <t_arceri at yahoo.com.au>
> ---
>   src/mesa/vbo/vbo_exec_array.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
> index 07ce08f..9c161cc 100644
> --- a/src/mesa/vbo/vbo_exec_array.c
> +++ b/src/mesa/vbo/vbo_exec_array.c
> @@ -581,9 +581,9 @@ vbo_handle_primitive_restart(struct gl_context *ctx,
>   {
>      struct vbo_context *vbo = vbo_context(ctx);
>
> -   if ((ib != NULL) &&
> -       ctx->Const.PrimitiveRestartInSoftware &&
> -       ctx->Array._PrimitiveRestart) {
> +   if (ctx->Const.PrimitiveRestartInSoftware &&
> +       ctx->Array._PrimitiveRestart &&
> +       (ib != NULL)) {
>         /* Handle primitive restart in software */
>         vbo_sw_primitive_restart(ctx, prim, nr_prims, ib, NULL);
>      } else {
>

Reviewed-by: Brian Paul <brianp at vmware.com>