Revert "intel: rename intel_pipe_shader to intel_pipeline_shader"

This reverts commit e47bf243b60c7195736ff86627a9f2a21d0e8104.  Wrong branch
pushed.
diff --git a/icd/intel/cmd.h b/icd/intel/cmd.h
index 9bdad9a..1513448 100644
--- a/icd/intel/cmd.h
+++ b/icd/intel/cmd.h
@@ -34,7 +34,6 @@
 #include "view.h"
 
 struct intel_pipeline;
-struct intel_pipeline_shader;
 struct intel_pipeline_delta;
 struct intel_viewport_state;
 struct intel_raster_state;
@@ -42,6 +41,7 @@
 struct intel_blend_state;
 struct intel_ds_state;
 struct intel_dset;
+struct intel_pipe_shader;
 
 struct intel_cmd_reloc;
 
@@ -119,7 +119,7 @@
 };
 
 struct intel_cmd_shader {
-    const struct intel_pipeline_shader *shader;
+    const struct intel_pipe_shader *shader;
     XGL_UINT kernel_pos;
 };