From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Thu, 18 Aug 2016 13:29:35 +0000 (-0700)
Subject: i965/blorp: Shorten binding table index enum names
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1367af159e6791c230f08ba77311f532f6aede07;p=mesa.git

i965/blorp: Shorten binding table index enum names

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
---

diff --git a/src/mesa/drivers/dri/i965/blorp_priv.h b/src/mesa/drivers/dri/i965/blorp_priv.h
index 9857db85793..0144c25f5cb 100644
--- a/src/mesa/drivers/dri/i965/blorp_priv.h
+++ b/src/mesa/drivers/dri/i965/blorp_priv.h
@@ -37,9 +37,9 @@ extern "C" {
  * Binding table indices used by BLORP.
  */
 enum {
-   BRW_BLORP_RENDERBUFFER_BINDING_TABLE_INDEX,
-   BRW_BLORP_TEXTURE_BINDING_TABLE_INDEX,
-   BRW_BLORP_NUM_BINDING_TABLE_ENTRIES
+   BLORP_RENDERBUFFER_BT_INDEX,
+   BLORP_TEXTURE_BT_INDEX,
+   BLORP_NUM_BT_ENTRIES
 };
 
 struct brw_blorp_surface_info
diff --git a/src/mesa/drivers/dri/i965/genX_blorp_exec.c b/src/mesa/drivers/dri/i965/genX_blorp_exec.c
index 0139f167a5a..8f9de9a3215 100644
--- a/src/mesa/drivers/dri/i965/genX_blorp_exec.c
+++ b/src/mesa/drivers/dri/i965/genX_blorp_exec.c
@@ -998,13 +998,13 @@ blorp_emit_surface_states(struct brw_context *brw,
    uint32_t bind_offset;
    uint32_t *bind =
       brw_state_batch(brw, AUB_TRACE_BINDING_TABLE,
-                      sizeof(uint32_t) * BRW_BLORP_NUM_BINDING_TABLE_ENTRIES,
+                      sizeof(uint32_t) * BLORP_NUM_BT_ENTRIES,
                       32, /* alignment */ &bind_offset);
 
-   bind[BRW_BLORP_RENDERBUFFER_BINDING_TABLE_INDEX] =
+   bind[BLORP_RENDERBUFFER_BT_INDEX] =
       blorp_emit_surface_state(brw, &params->dst, true);
    if (params->src.addr.buffer) {
-      bind[BRW_BLORP_TEXTURE_BINDING_TABLE_INDEX] =
+      bind[BLORP_TEXTURE_BT_INDEX] =
          blorp_emit_surface_state(brw, &params->src, false);
    }