commit c3ddee609fb684f90ad97ab5846265ef294548e0
author Chia-I Wu <olvaffe@gmail.com> Tue Sep 02 10:53:20 2014 +0800
committer Chia-I Wu <olvaffe@gmail.com> Tue Sep 02 13:06:50 2014 +0800
tree e771f756fb57566bb21278ee7c05971b14910b4d
parent 39026c9234adfd81b366562aea124cb411d83a8c

intel: intel_pipeline should not have XGL_PIPELINE_SHADER

They may have a shorter lifespan.

icd/intel/pipeline.h

diff --git a/icd/intel/pipeline.h b/icd/intel/pipeline.h
index bf6e811..88eace5 100644
--- a/icd/intel/pipeline.h
+++ b/icd/intel/pipeline.h
@@ -105,6 +105,9 @@
     XGL_FLAGS barycentric_interps;
 
     struct intel_rmap *rmap;
+
+    void *pcb;
+    XGL_SIZE pcb_size;
 };
 
 /*
@@ -157,13 +160,11 @@
     XGL_PIPELINE_TESS_STATE_CREATE_INFO tess_state;
 
     uint32_t active_shaders;
-    XGL_PIPELINE_SHADER vs;
-    XGL_PIPELINE_SHADER fs;
-    struct intel_pipe_shader intel_vs;
-    struct intel_pipe_shader intel_fs;
-    struct intel_pipe_shader gs;
+    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;
 
     uint32_t wa_flags;