Revert "intel: rename intel_pipe_shader to intel_pipeline_shader"
This reverts commit e47bf243b60c7195736ff86627a9f2a21d0e8104. Wrong branch
pushed.
diff --git a/icd/intel/pipeline.h b/icd/intel/pipeline.h
index 36682f7..ad6262f 100644
--- a/icd/intel/pipeline.h
+++ b/icd/intel/pipeline.h
@@ -80,9 +80,7 @@
#define SHADER_FRAGMENT_FLAG (1 << XGL_SHADER_STAGE_FRAGMENT)
#define SHADER_COMPUTE_FLAG (1 << XGL_SHADER_STAGE_COMPUTE)
-struct intel_pipeline_shader {
- /* this is not an intel_obj */
-
+struct intel_pipe_shader {
void *pCode;
uint32_t codeSize;
@@ -159,14 +157,14 @@
uint32_t active_shaders;
XGL_PIPELINE_SHADER vs;
XGL_PIPELINE_SHADER fs;
- struct intel_pipeline_shader intel_vs;
+ struct intel_pipe_shader intel_vs;
struct intel_rmap *vs_rmap;
- struct intel_pipeline_shader intel_fs;
+ struct intel_pipe_shader intel_fs;
struct intel_rmap *fs_rmap;
- struct intel_pipeline_shader gs;
- struct intel_pipeline_shader tess_control;
- struct intel_pipeline_shader tess_eval;
- struct intel_pipeline_shader compute;
+ struct intel_pipe_shader gs;
+ struct intel_pipe_shader tess_control;
+ struct intel_pipe_shader tess_eval;
+ struct intel_pipe_shader compute;
uint32_t wa_flags;