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/pipeline.h

diff --git a/icd/intel/pipeline.h b/icd/intel/pipeline.h
index dfb11cc..611cca6 100644
--- a/icd/intel/pipeline.h
+++ b/icd/intel/pipeline.h
@@ -33,9 +33,9 @@
 #include "obj.h"
 #include "dev.h"
 
-#define INTEL_RMAP_SLOT_RT ((XGL_UINT) -1)
-#define INTEL_RMAP_SLOT_DYN ((XGL_UINT) -2)
-struct intel_rmap_slot {
+#define INTEL_PIPELINE_RMAP_SLOT_RT ((XGL_UINT) -1)
+#define INTEL_PIPELINE_RMAP_SLOT_DYN ((XGL_UINT) -2)
+struct intel_pipeline_rmap_slot {
     /*
      *
      * When path_len is 0, the slot is unused.
@@ -55,7 +55,7 @@
 /**
  * Shader resource mapping.
  */
-struct intel_rmap {
+struct intel_pipeline_rmap {
     /* this is not an intel_obj */
 
     XGL_UINT rt_count;
@@ -69,7 +69,7 @@
      * uav_count slots +
      * sampler_count slots
      */
-    struct intel_rmap_slot *slots;
+    struct intel_pipeline_rmap_slot *slots;
     XGL_UINT slot_count;
 };
 
@@ -106,7 +106,7 @@
 
     XGL_FLAGS barycentric_interps;
 
-    struct intel_rmap *rmap;
+    struct intel_pipeline_rmap *rmap;
 
     void *pcb;
     XGL_SIZE pcb_size;