commit f2b6d72d5d414bd403179e9fcec48eaa6feaf7e3
author Chia-I Wu <olvaffe@gmail.com> Tue Sep 02 08:52:27 2014 +0800
committer Chia-I Wu <olvaffe@gmail.com> Tue Sep 02 13:06:50 2014 +0800
tree e464a3fe947ee3d6afec2c1ddccd075621779114
parent c3ddee609fb684f90ad97ab5846265ef294548e0

intel: rename intel_pipe_shader to intel_pipeline_shader

It is initialized from XGL_PIPELINE_SHADER, and we already use intel_pipeline
for XGL_PIPELINE.

icd/intel/pipeline.h

diff --git a/icd/intel/pipeline.h b/icd/intel/pipeline.h
index 88eace5..761d9bd 100644
--- a/icd/intel/pipeline.h
+++ b/icd/intel/pipeline.h
@@ -80,7 +80,9 @@
 #define SHADER_FRAGMENT_FLAG          (1 << XGL_SHADER_STAGE_FRAGMENT)
 #define SHADER_COMPUTE_FLAG           (1 << XGL_SHADER_STAGE_COMPUTE)
 
-struct intel_pipe_shader {
+struct intel_pipeline_shader {
+    /* this is not an intel_obj */
+
     void *pCode;
     uint32_t codeSize;
 
@@ -160,12 +162,12 @@
     XGL_PIPELINE_TESS_STATE_CREATE_INFO tess_state;
 
     uint32_t active_shaders;
-    struct intel_pipe_shader vs;
-    struct intel_pipe_shader tess_control;
-    struct intel_pipe_shader tess_eval;
-    struct intel_pipe_shader gs;
-    struct intel_pipe_shader fs;
-    struct intel_pipe_shader compute;
+    struct intel_pipeline_shader vs;
+    struct intel_pipeline_shader tess_control;
+    struct intel_pipeline_shader tess_eval;
+    struct intel_pipeline_shader gs;
+    struct intel_pipeline_shader fs;
+    struct intel_pipeline_shader compute;
 
     uint32_t wa_flags;
 
@@ -214,4 +216,5 @@
     XGL_PIPELINE                                p1,
     XGL_PIPELINE                                p2,
     XGL_PIPELINE_DELTA*                         delta);
-#endif // PIPELINE_H
+
+#endif /* PIPELINE_H */