[Mesa-dev] [PATCH] st/mesa: fix assert to be simpler

[Marek Olšák]

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Marek

On Tue, Jun 20, 2017 at 7:51 AM, Dave Airlie <airlied at gmail.com> wrote:
> From: Dave Airlie <airlied at redhat.com>
>
> I just noticed a warning with a non-debug build, but really
> this could all be one line, and I'm not even 100% the assert
> makes sense here.
> ---
>  src/mesa/state_tracker/st_texture.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c
> index 9de3b9a..5863628 100644
> --- a/src/mesa/state_tracker/st_texture.c
> +++ b/src/mesa/state_tracker/st_texture.c
> @@ -508,8 +508,6 @@ static GLuint64
>  st_create_texture_handle_from_unit(struct st_context *st,
>                                     struct gl_program *prog, GLuint texUnit)
>  {
> -   struct gl_context *ctx = st->ctx;
> -   struct gl_texture_object *texObj;
>     struct pipe_context *pipe = st->pipe;
>     struct pipe_sampler_view *view;
>     struct pipe_sampler_state sampler;
> @@ -519,8 +517,7 @@ st_create_texture_handle_from_unit(struct st_context *st,
>
>     st_convert_sampler_from_unit(st, &sampler, texUnit);
>
> -   texObj = ctx->Texture.Unit[texUnit]._Current;
> -   assert(texObj);
> +   assert(st->ctx->Texture.Unit[texUnit]._Current);
>
>     return pipe->create_texture_handle(pipe, view, &sampler);
>  }
> --
> 2.9.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev