[Mesa-dev] [PATCH] i965: Delete render ring prelude.

[Grazvydas Ignotas]

It seems this has not removed enough and introduced a warning:

intel_batchbuffer.c: In function ‘intel_batchbuffer_require_space’:
intel_batchbuffer.c:132:22: warning: unused variable ‘prev_ring’
[-Wunused-variable]
    enum brw_gpu_ring prev_ring = brw->batch.ring;

Gražvydas

On Wed, Mar 8, 2017 at 2:39 AM, Kenneth Graunke <kenneth at whitecape.org> wrote:
> This was a hook I came up when trying to do the initial performance
> counter work years ago.  Nothing's used it for a long time, and the
> upcoming performance counter support doesn't want it either.
>
> So, goodbye render ring prelude.
>
> Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
> ---
>  src/mesa/drivers/dri/i965/intel_batchbuffer.c | 9 ---------
>  src/mesa/drivers/dri/i965/intel_batchbuffer.h | 1 -
>  2 files changed, 10 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
> index afa061d70df..8e449829c08 100644
> --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c
> +++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
> @@ -134,9 +134,6 @@ intel_batchbuffer_require_space(struct brw_context *brw, GLuint sz,
>      * brw->batch.ring to UNKNOWN_RING, so we need to set it here at the end.
>      */
>     brw->batch.ring = ring;
> -
> -   if (unlikely(prev_ring == UNKNOWN_RING && ring == RENDER_RING))
> -      intel_batchbuffer_emit_render_ring_prelude(brw);
>  }
>
>  static void
> @@ -179,12 +176,6 @@ do_batch_dump(struct brw_context *brw)
>     }
>  }
>
> -void
> -intel_batchbuffer_emit_render_ring_prelude(struct brw_context *brw)
> -{
> -   /* Un-used currently */
> -}
> -
>  /**
>   * Called when starting a new batch buffer.
>   */
> diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.h b/src/mesa/drivers/dri/i965/intel_batchbuffer.h
> index bf7cadfc4d6..01d48048a68 100644
> --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.h
> +++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.h
> @@ -38,7 +38,6 @@ extern "C" {
>
>  struct intel_batchbuffer;
>
> -void intel_batchbuffer_emit_render_ring_prelude(struct brw_context *brw);
>  void intel_batchbuffer_init(struct intel_batchbuffer *batch, dri_bufmgr *bufmgr,
>                              bool has_llc);
>  void intel_batchbuffer_free(struct intel_batchbuffer *batch);
> --
> 2.11.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev