ilo: clean up ilo_blitter_pipe_begin()

[mesa.git] / src / gallium / drivers / ilo / ilo_gpe_gen6.h

diff --git a/src/gallium/drivers/ilo/ilo_gpe_gen6.h b/src/gallium/drivers/ilo/ilo_gpe_gen6.h
index 6e27364547163d295e084a41e52237fcbe96e478..7e24f97b8ca12b5d6a36a2586057e87cb572f4b2 100644 (file)
--- a/src/gallium/drivers/ilo/ilo_gpe_gen6.h
+++ b/src/gallium/drivers/ilo/ilo_gpe_gen6.h
@@ -29,6 +29,7 @@
 #define ILO_GPE_GEN6_H
 
 #include "ilo_common.h"
+#include "ilo_gpe.h"
 
 #define ILO_GPE_VALID_GEN(dev, min_gen, max_gen) \
    assert((dev)->gen >= ILO_GEN(min_gen) && (dev)->gen <= ILO_GEN(max_gen))
@@ -208,7 +209,7 @@ typedef void
 
 typedef void
 (*ilo_gpe_gen6_3DSTATE_INDEX_BUFFER)(const struct ilo_dev_info *dev,
-                                     const struct pipe_index_buffer *ib,
+                                     const struct ilo_ib_state *ib,
                                      bool enable_cut_index,
                                      struct ilo_cp *cp);
 
@@ -234,21 +235,21 @@ typedef void
 
 typedef void
 (*ilo_gpe_gen6_3DSTATE_VS)(const struct ilo_dev_info *dev,
-                           const struct ilo_shader *vs,
+                           const struct ilo_shader_state *vs,
                            int num_samplers,
                            struct ilo_cp *cp);
 
 typedef void
 (*ilo_gpe_gen6_3DSTATE_GS)(const struct ilo_dev_info *dev,
-                           const struct ilo_shader *gs,
-                           const struct ilo_shader *vs,
-                           uint32_t vs_offset,
+                           const struct ilo_shader_state *gs,
+                           const struct ilo_shader_state *vs,
+                           int verts_per_prim,
                            struct ilo_cp *cp);
 
 typedef void
 (*ilo_gpe_gen6_3DSTATE_CLIP)(const struct ilo_dev_info *dev,
                              const struct ilo_rasterizer_state *rasterizer,
-                             bool has_linear_interp,
+                             const struct ilo_shader_state *fs,
                              bool enable_guardband,
                              int num_viewports,
                              struct ilo_cp *cp);
@@ -256,15 +257,15 @@ typedef void
 typedef void
 (*ilo_gpe_gen6_3DSTATE_SF)(const struct ilo_dev_info *dev,
                            const struct ilo_rasterizer_state *rasterizer,
-                           const struct ilo_shader *fs,
-                           const struct ilo_shader *last_sh,
+                           const struct ilo_shader_state *fs,
+                           const struct ilo_shader_state *last_sh,
                            struct ilo_cp *cp);
 
 typedef void
 (*ilo_gpe_gen6_3DSTATE_WM)(const struct ilo_dev_info *dev,
-                           const struct ilo_shader *fs,
+                           const struct ilo_shader_state *fs,
                            int num_samplers,
-                           const struct pipe_rasterizer_state *rasterizer,
+                           const struct ilo_rasterizer_state *rasterizer,
                            bool dual_blend, bool cc_may_kill,
                            struct ilo_cp *cp);
 
@@ -361,12 +362,13 @@ typedef void
 typedef void
 (*ilo_gpe_gen6_3DPRIMITIVE)(const struct ilo_dev_info *dev,
                             const struct pipe_draw_info *info,
+                            const struct ilo_ib_state *ib,
                             bool rectlist,
                             struct ilo_cp *cp);
 
 typedef uint32_t
 (*ilo_gpe_gen6_INTERFACE_DESCRIPTOR_DATA)(const struct ilo_dev_info *dev,
-                                          const struct ilo_shader **cs,
+                                          const struct ilo_shader_state **cs,
                                           uint32_t *sampler_state,
                                           int *num_samplers,
                                           uint32_t *binding_table_state,
@@ -543,16 +545,16 @@ ilo_gpe_gen6_translate_texture(enum pipe_texture_target target);
 
 void
 ilo_gpe_gen6_fill_3dstate_sf_raster(const struct ilo_dev_info *dev,
-                                    const struct ilo_rasterizer_sf *sf,
+                                    const struct ilo_rasterizer_state *rasterizer,
                                     int num_samples,
                                     enum pipe_format depth_format,
                                     uint32_t *payload, unsigned payload_len);
 
 void
 ilo_gpe_gen6_fill_3dstate_sf_sbe(const struct ilo_dev_info *dev,
-                                 const struct pipe_rasterizer_state *rasterizer,
-                                 const struct ilo_shader *fs,
-                                 const struct ilo_shader *last_sh,
+                                 const struct ilo_rasterizer_state *rasterizer,
+                                 const struct ilo_shader_state *fs,
+                                 const struct ilo_shader_state *last_sh,
                                  uint32_t *dw, int num_dwords);
 
 #endif /* ILO_GPE_GEN6_H */