Mesa (master): mesa: remove redundant NULL check in update_single_program_texture_state

Marek Olšák mareko at kemper.freedesktop.org
Tue Oct 17 02:16:32 UTC 2017


Module: Mesa
Branch: master
Commit: 1b86dbc144f168efe98cc9c02dc93d4176b8aac0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b86dbc144f168efe98cc9c02dc93d4176b8aac0

Author: Miklós Máté <mtmkls at gmail.com>
Date:   Sun Oct 15 19:46:05 2017 +0200

mesa: remove redundant NULL check in update_single_program_texture_state

update_single_program_texture() never returns NULL.

Signed-off-by: Miklós Máté <mtmkls at gmail.com>
Signed-off-by: Marek Olšák <marek.olsak at amd.com>
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>

---

 src/mesa/main/texstate.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index edd2253731..776806d632 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -686,8 +686,6 @@ update_single_program_texture_state(struct gl_context *ctx,
    struct gl_texture_object *texObj;
 
    texObj = update_single_program_texture(ctx, prog, unit);
-   if (!texObj)
-      return;
 
    _mesa_reference_texobj(&ctx->Texture.Unit[unit]._Current, texObj);
    BITSET_SET(enabled_texture_units, unit);




More information about the mesa-commit mailing list