From 5a40a0008961ff3172f78d1a61bf3516680100e1 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Wed, 21 May 2014 21:26:16 +1000 Subject: [PATCH] mesa: check constant before null check For most drivers this if statement is always going to fail so check the constant value first. Signed-off-by: Timothy Arceri Reviewed-by: Brian Paul --- 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 07ce08feff9..9c161ccca72 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 { -- 2.30.2