From: Chia-I Wu <olvaffe@gmail.com>
Date: Mon, 22 Sep 2014 07:13:23 +0000 (+0800)
Subject: ilo: make gen6_pipeline_update_max_svbi() static
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2c1f978d6c70dcf1cb854560572a5bca4da1da88;p=mesa.git

ilo: make gen6_pipeline_update_max_svbi() static

We do not need to call it from GEN7 pipeline anymore since software
PIPE_QUERY_PRIMITIVES_EMITTED is gone.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
---

diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c
index dbfc9935940..686cf5fb589 100644
--- a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c
+++ b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c
@@ -524,7 +524,7 @@ gen6_pipeline_gs(struct ilo_3d_pipeline *p,
    }
 }
 
-bool
+static bool
 gen6_pipeline_update_max_svbi(struct ilo_3d_pipeline *p,
                               const struct ilo_state_vector *vec,
                               struct gen6_pipeline_session *session)
diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.h b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.h
index 247e10e11dc..85a89858918 100644
--- a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.h
+++ b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.h
@@ -144,11 +144,6 @@ gen6_pipeline_states(struct ilo_3d_pipeline *p,
                      const struct ilo_state_vector *ilo,
                      struct gen6_pipeline_session *session);
 
-bool
-gen6_pipeline_update_max_svbi(struct ilo_3d_pipeline *p,
-                              const struct ilo_state_vector *ilo,
-                              struct gen6_pipeline_session *session);
-
 int
 gen6_pipeline_estimate_state_size(const struct ilo_3d_pipeline *p,
                                   const struct ilo_state_vector *ilo);
diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen7.c b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen7.c
index d94570e36b6..2e3c2ec6ac7 100644
--- a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen7.c
+++ b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen7.c
@@ -414,8 +414,6 @@ gen7_pipeline_sol(struct ilo_3d_pipeline *p,
 
    so_info = ilo_shader_get_kernel_so_info(shader);
 
-   gen6_pipeline_update_max_svbi(p, vec, session);
-
    /* 3DSTATE_SO_BUFFER */
    if ((DIRTY(SO) || dirty_sh || session->batch_bo_changed) &&
        vec->so.enabled) {