From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 8 Mar 2017 00:12:00 +0000 (-0800)
Subject: i965: Delete render ring prelude.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=071d80bde2a78f464a7f54c3e6c6e42845ef52e4;p=mesa.git

i965: Delete render ring prelude.

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@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
---

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);