[Mesa-dev] [PATCH] i965: Remove redundant (and uninitialized) field vec4_generator::ctx.

[Ian Romanick]

On 08/22/2013 05:23 PM, Paul Berry wrote:
> We never noticed that this field was uninitialized because it is only
> used in an error path that reports internal Mesa errors.
>
> But it's silly to have it around anyway because &brw->ctx is
> equivalent.
>
> Should fix Coverity defect CID 1063351: Uninitialized pointer field
> (UNINIT_CTOR) /src/mesa/drivers/dri/i965/brw_vec4_emit.cpp: 148

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

> ---
>   src/mesa/drivers/dri/i965/brw_vec4.h        | 1 -
>   src/mesa/drivers/dri/i965/brw_vec4_emit.cpp | 4 ++--
>   2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h
> index 111b105..894ff1d 100644
> --- a/src/mesa/drivers/dri/i965/brw_vec4.h
> +++ b/src/mesa/drivers/dri/i965/brw_vec4.h
> @@ -599,7 +599,6 @@ private:
>      void mark_surface_used(unsigned surf_index);
>
>      struct brw_context *brw;
> -   struct gl_context *ctx;
>
>      struct brw_compile *p;
>
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp
> index ce9bcd0..0364ced 100644
> --- a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp
> @@ -893,10 +893,10 @@ vec4_generator::generate_vec4_instruction(vec4_instruction *instruction,
>
>      default:
>         if (inst->opcode < (int) ARRAY_SIZE(opcode_descs)) {
> -         _mesa_problem(ctx, "Unsupported opcode in `%s' in VS\n",
> +         _mesa_problem(&brw->ctx, "Unsupported opcode in `%s' in VS\n",
>                          opcode_descs[inst->opcode].name);
>         } else {
> -         _mesa_problem(ctx, "Unsupported opcode %d in VS", inst->opcode);
> +         _mesa_problem(&brw->ctx, "Unsupported opcode %d in VS", inst->opcode);
>         }
>         abort();
>      }
>