ilo: make ilo_render_emit_draw() direct

Remove emit_draw() and ILO_RENDER_DRAW indirections.  With all emit functions
being direct now, ilo_render_estimate_size() and more can also be removed.

Signed-off-by: Chia-I Wu <[email protected]>

1 files changed, 8 insertions, 29 deletions

diff --git a/src/gallium/drivers/ilo/ilo_render.h b/src/gallium/drivers/ilo/ilo_render.h
index dd4c3c0f95a..60e3769e0dc 100644
--- a/src/gallium/drivers/ilo/ilo_render.h
+++ b/src/gallium/drivers/ilo/ilo_render.h
@@ -37,10 +37,6 @@ struct ilo_cp;
 struct ilo_query;
 struct ilo_state_vector;
 
-enum ilo_render_action {
-   ILO_RENDER_DRAW,
-};
-
 /**
  * Render Engine.
  */
@@ -54,13 +50,6 @@ struct ilo_render {
    uint32_t packed_sample_position_4x;
    uint32_t packed_sample_position_8x[2];
 
-   int (*estimate_size)(struct ilo_render *render,
-                        enum ilo_render_action action,
-                        const void *arg);
-
-   void (*emit_draw)(struct ilo_render *render,
-                     const struct ilo_state_vector *vec);
-
    bool hw_ctx_changed;
 
    /*
@@ -143,24 +132,6 @@ ilo_render_destroy(struct ilo_render *render);
 /**
  * Estimate the size of an action.
  */
-static inline int
-ilo_render_estimate_size(struct ilo_render *render,
-                         enum ilo_render_action action,
-                         const void *arg)
-{
-   return render->estimate_size(render, action, arg);
-}
-
-/**
- * Emit context states and 3DPRIMITIVE.
- */
-static inline void
-ilo_render_emit_draw(struct ilo_render *render,
-                     const struct ilo_state_vector *vec)
-{
-   render->emit_draw(render, vec);
-}
-
 void
 ilo_render_get_sample_position(const struct ilo_render *render,
                                unsigned sample_count,
@@ -195,4 +166,12 @@ void
 ilo_render_emit_rectlist(struct ilo_render *render,
                          const struct ilo_blitter *blitter);
 
+int
+ilo_render_get_draw_len(const struct ilo_render *render,
+                        const struct ilo_state_vector *vec);
+
+void
+ilo_render_emit_draw(struct ilo_render *render,
+                     const struct ilo_state_vector *vec);
+
 #endif /* ILO_RENDER_H */