Module: Mesa Branch: master Commit: 76df7edacfd684f97b38032773a6c56919970b15 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=76df7edacfd684f97b38032773a6c56919970b15
Author: Vinson Lee <[email protected]> Date: Fri Sep 27 21:27:19 2013 -0700 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 <[email protected]> Reviewed-by: Brian Paul <[email protected]> --- src/gallium/drivers/llvmpipe/lp_state_fs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c index 875a3cf..8223d2a 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 { _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
