From: Vinson Lee <vlee@freedesktop.org>
Date: Sat, 28 Sep 2013 04:27:19 +0000 (-0700)
Subject: llvmpipe: Remove unnecessary null check of shader.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=76df7edacfd684f97b38032773a6c56919970b15;p=mesa.git

llvmpipe: Remove unnecessary null check of shader.

shader has already been dereferenced earlier so cannot be null here.

Fixes "Dereference before null check" defect reported by Coverity.

Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index 875a3cf11a1..8223d2ad7eb 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c
@@ -2435,7 +2435,7 @@ generate_variant(struct llvmpipe_context *lp,
          !shader->info.base.uses_kill
       ? TRUE : FALSE;
 
-   if ((!shader || shader->info.base.num_tokens <= 1) &&
+   if ((shader->info.base.num_tokens <= 1) &&
        !key->depth.enabled && !key->stencil[0].enabled) {
       variant->ps_inv_multiplier = 0;
    } else {