[Mesa-dev] [PATCH v2 3/5] i965: avoid 'unused variable'

[andrey simiklit]

On Tue, Nov 13, 2018 at 6:35 PM Eric Engestrom <eric.engestrom at intel.com>
wrote:

> On Tuesday, 2018-11-13 14:19:30 +0200, asimiklit.work at gmail.com wrote:
> > From: Andrii Simiklit <andrii.simiklit at globallogic.com>
> >
> > 1. brw_pipe_control.c:311:34: warning:
> >     unused variable ‘devinfo’
> > 2. brw_program_binary.c:209:19: warning:
> >     unused variable ‘gen_size’
> > 3. brw_program_binary.c:216:19: warning:
> >     unused variable ‘nir_size’
> >
> > v2: Changes for unreproducible issues were removed
> >
> > Signed-off-by: Andrii Simiklit <andrii.simiklit at globallogic.com>
> > ---
> >  src/mesa/drivers/dri/i965/brw_pipe_control.c   | 2 +-
> >  src/mesa/drivers/dri/i965/brw_program_binary.c | 4 ++--
> >  2 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/src/mesa/drivers/dri/i965/brw_pipe_control.c
> b/src/mesa/drivers/dri/i965/brw_pipe_control.c
> > index 122ac26070..a3f521b5ae 100644
> > --- a/src/mesa/drivers/dri/i965/brw_pipe_control.c
> > +++ b/src/mesa/drivers/dri/i965/brw_pipe_control.c
> > @@ -308,7 +308,7 @@ brw_emit_depth_stall_flushes(struct brw_context *brw)
> >  void
> >  gen7_emit_vs_workaround_flush(struct brw_context *brw)
> >  {
> > -   const struct gen_device_info *devinfo = &brw->screen->devinfo;
> > +   MAYBE_UNUSED const struct gen_device_info *devinfo =
> &brw->screen->devinfo;
> >
> >     assert(devinfo->gen == 7);
>
> This could've just been folded into the assert, but this works.
>
> Patches 1-3 are:
> Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
>

Thanks a lot for review.


>
> I assume you want me to push them for you?
>

Yes, it would be great. Thanks )


>
> >     brw_emit_pipe_control_write(brw,
> > diff --git a/src/mesa/drivers/dri/i965/brw_program_binary.c
> b/src/mesa/drivers/dri/i965/brw_program_binary.c
> > index db03332241..1298d9e765 100644
> > --- a/src/mesa/drivers/dri/i965/brw_program_binary.c
> > +++ b/src/mesa/drivers/dri/i965/brw_program_binary.c
> > @@ -206,14 +206,14 @@ brw_program_deserialize_driver_blob(struct
> gl_context *ctx,
> >           break;
> >        switch ((enum driver_cache_blob_part)part_type) {
> >        case GEN_PART: {
> > -         uint32_t gen_size = blob_read_uint32(&reader);
> > +         MAYBE_UNUSED uint32_t gen_size = blob_read_uint32(&reader);
> >           assert(!reader.overrun &&
> >                  (uintptr_t)(reader.end - reader.current) > gen_size);
> >           deserialize_gen_program(&reader, ctx, prog, stage);
> >           break;
> >        }
> >        case NIR_PART: {
> > -         uint32_t nir_size = blob_read_uint32(&reader);
> > +         MAYBE_UNUSED uint32_t nir_size = blob_read_uint32(&reader);
> >           assert(!reader.overrun &&
> >                  (uintptr_t)(reader.end - reader.current) > nir_size);
> >           const struct nir_shader_compiler_options *options =
> > --
> > 2.17.1
> >
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20181114/3783ac00/attachment.html>