commit 2098376c3cd692dd89c9df182dff3e7d362b14e8
author Chia-I Wu <olvaffe@gmail.com> Tue Sep 02 12:07:28 2014 +0800
committer Chia-I Wu <olvaffe@gmail.com> Tue Sep 02 13:06:50 2014 +0800
tree 63e63c5351c321d22032097ea6667262fafaa141
parent 95959fbe5cea12f06984c98ac2325d6ae3ee7538

intel: rename rmap to pipeline rmap

For consistency.

icd/intel/cmd_pipeline.c

diff --git a/icd/intel/cmd_pipeline.c b/icd/intel/cmd_pipeline.c
index c279cf9..1776daa 100644
--- a/icd/intel/cmd_pipeline.c
+++ b/icd/intel/cmd_pipeline.c
@@ -1439,7 +1439,7 @@
 }
 
 static void emit_ps_resources(struct intel_cmd *cmd,
-                              const struct intel_rmap *rmap)
+                              const struct intel_pipeline_rmap *rmap)
 {
     const XGL_UINT surface_count = rmap->rt_count +
         rmap->resource_count + rmap->uav_count;
@@ -1449,14 +1449,14 @@
     assert(surface_count <= ARRAY_SIZE(binding_table));
 
     for (i = 0; i < surface_count; i++) {
-        const struct intel_rmap_slot *slot = &rmap->slots[i];
+        const struct intel_pipeline_rmap_slot *slot = &rmap->slots[i];
         uint32_t *dw;
 
         switch (slot->path_len) {
         case 0:
             pos = 0;
             break;
-        case INTEL_RMAP_SLOT_RT:
+        case INTEL_PIPELINE_RMAP_SLOT_RT:
             {
                 const struct intel_rt_view *view = cmd->bind.att.rt[i];
 
@@ -1469,7 +1469,7 @@
                 cmd_state_advance(cmd, view->cmd_len);
             }
             break;
-        case INTEL_RMAP_SLOT_DYN:
+        case INTEL_PIPELINE_RMAP_SLOT_DYN:
             {
                 const struct intel_mem_view *view =
                     &cmd->bind.dyn_view.graphics;