Mesa (master): ilo: make gen6_pipeline_update_max_svbi() static

Chia-I Wu olv at kemper.freedesktop.org
Tue Sep 23 02:15:31 UTC 2014


Module: Mesa
Branch: master
Commit: 2c1f978d6c70dcf1cb854560572a5bca4da1da88
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2c1f978d6c70dcf1cb854560572a5bca4da1da88

Author: Chia-I Wu <olvaffe at gmail.com>
Date:   Mon Sep 22 15:13:23 2014 +0800

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 at gmail.com>

---

 src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c |    2 +-
 src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.h |    5 -----
 src/gallium/drivers/ilo/ilo_3d_pipeline_gen7.c |    2 --
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c
index dbfc993..686cf5f 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 247e10e..85a8985 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 d94570e..2e3c2ec 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) {




More information about the mesa-commit mailing list