[Mesa-dev] [PATCH] main: remove redundant NULL check

Marek Olšák maraeo at gmail.com
Tue Oct 17 02:16:48 UTC 2017


Pushed, thanks!

Marek

On Sun, Oct 15, 2017 at 7:46 PM, Miklós Máté <mtmkls at gmail.com> wrote:
> update_single_program_texture() never returns NULL.
>
> Signed-off-by: Miklós Máté <mtmkls at gmail.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);
> --
> 2.15.0.rc0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list