Mesa (master): ilo: prefix 3DSTATE_VF with gen75

Chia-I Wu olv at kemper.freedesktop.org
Tue Nov 11 08:04:46 UTC 2014


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

Author: Chia-I Wu <olvaffe at gmail.com>
Date:   Tue Nov 11 09:11:37 2014 +0800

ilo: prefix 3DSTATE_VF with gen75

3DSTATE_VF is Gen7.5+ only.

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

---

 src/gallium/drivers/ilo/ilo_builder_3d_top.h |    6 +++---
 src/gallium/drivers/ilo/ilo_render_gen6.c    |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/ilo/ilo_builder_3d_top.h b/src/gallium/drivers/ilo/ilo_builder_3d_top.h
index 697a477..39bd1e5 100644
--- a/src/gallium/drivers/ilo/ilo_builder_3d_top.h
+++ b/src/gallium/drivers/ilo/ilo_builder_3d_top.h
@@ -311,9 +311,9 @@ gen7_3DSTATE_URB_GS(struct ilo_builder *builder,
 }
 
 static inline void
-gen7_3DSTATE_VF(struct ilo_builder *builder,
-                bool enable_cut_index,
-                uint32_t cut_index)
+gen75_3DSTATE_VF(struct ilo_builder *builder,
+                 bool enable_cut_index,
+                 uint32_t cut_index)
 {
    const uint8_t cmd_len = 2;
    uint32_t *dw;
diff --git a/src/gallium/drivers/ilo/ilo_render_gen6.c b/src/gallium/drivers/ilo/ilo_render_gen6.c
index 4221f69..deaa515 100644
--- a/src/gallium/drivers/ilo/ilo_render_gen6.c
+++ b/src/gallium/drivers/ilo/ilo_render_gen6.c
@@ -447,7 +447,7 @@ gen6_draw_vf(struct ilo_render *r,
 
       /* 3DSTATE_VF */
       if (session->primitive_restart_changed) {
-         gen7_3DSTATE_VF(r->builder, vec->draw->primitive_restart,
+         gen75_3DSTATE_VF(r->builder, vec->draw->primitive_restart,
                vec->draw->restart_index);
       }
    }




More information about the mesa-commit mailing list