ilo: clean up ilo_blitter_pipe_begin()

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

diff --git a/src/gallium/drivers/ilo/ilo_context.h b/src/gallium/drivers/ilo/ilo_context.h
index 07905b70176c2b535dbcddc541ff707081d337af..a5c1ce0755afa70ae1d1943515da8a710a6369b5 100644 (file)
--- a/src/gallium/drivers/ilo/ilo_context.h
+++ b/src/gallium/drivers/ilo/ilo_context.h
@@ -29,14 +29,17 @@
 #define ILO_CONTEXT_H
 
 #include "pipe/p_context.h"
+#include "util/u_slab.h"
 
 #include "ilo_gpe.h"
 #include "ilo_common.h"
 
-struct blitter_context;
+struct pipe_draw_info;
+struct u_upload_mgr;
 struct intel_winsys;
 struct intel_bo;
 struct ilo_3d;
+struct ilo_blitter;
 struct ilo_cp;
 struct ilo_screen;
 struct ilo_shader_state;
@@ -47,89 +50,55 @@ struct ilo_context {
    struct intel_winsys *winsys;
    struct ilo_dev_info *dev;
 
+   struct util_slab_mempool transfer_mempool;
+
    struct ilo_cp *cp;
    struct intel_bo *last_cp_bo;
 
    struct ilo_shader_cache *shader_cache;
    struct ilo_3d *hw3d;
-   struct blitter_context *blitter;
+   struct ilo_blitter *blitter;
+
+   struct u_upload_mgr *uploader;
 
+   const struct pipe_draw_info *draw;
    uint32_t dirty;
 
    struct ilo_vb_state vb;
    const struct ilo_ve_state *ve;
    struct ilo_ib_state ib;
 
-   struct pipe_blend_state *blend;
-   struct pipe_rasterizer_state *rasterizer;
-   struct pipe_depth_stencil_alpha_state *depth_stencil_alpha;
-   struct ilo_shader_state *fs;
    struct ilo_shader_state *vs;
    struct ilo_shader_state *gs;
 
-   struct pipe_blend_color blend_color;
-   struct pipe_stencil_ref stencil_ref;
-   unsigned sample_mask;
+   struct ilo_so_state so;
+
    struct pipe_clip_state clip;
-   struct pipe_framebuffer_state framebuffer;
+   struct ilo_viewport_state viewport;
+   struct ilo_scissor_state scissor;
+
+   const struct ilo_rasterizer_state *rasterizer;
    struct pipe_poly_stipple poly_stipple;
-   struct pipe_scissor_state scissor;
-   struct pipe_viewport_state viewport;
-
-   struct {
-      struct pipe_sampler_state *samplers[ILO_MAX_SAMPLERS];
-      unsigned num_samplers;
-   } samplers[PIPE_SHADER_TYPES];
-
-   struct {
-      struct pipe_sampler_view *views[ILO_MAX_SAMPLER_VIEWS];
-      unsigned num_views;
-   } sampler_views[PIPE_SHADER_TYPES];
-
-   struct {
-      struct pipe_constant_buffer buffers[ILO_MAX_CONST_BUFFERS];
-      unsigned num_buffers;
-   } constant_buffers[PIPE_SHADER_TYPES];
-
-   struct {
-      struct pipe_stream_output_target *targets[ILO_MAX_SO_BUFFERS];
-      unsigned num_targets;
-      unsigned append_bitmask;
-   } stream_output_targets;
-
-   struct {
-      struct pipe_surface *surfaces[PIPE_MAX_SHADER_RESOURCES];
-      unsigned num_surfaces;
-   } shader_resources;
-
-   struct ilo_shader_state *compute;
-
-   struct {
-      struct pipe_surface *surfaces[PIPE_MAX_SHADER_RESOURCES];
-      unsigned num_surfaces;
-   } compute_resources;
-
-   struct {
-      /*
-       * XXX These should not be treated as real resources (and there could be
-       * thousands of them).  They should be treated as regions in GLOBAL
-       * resource, which is the only real resource.
-       *
-       * That is, a resource here should instead be
-       *
-       *   struct ilo_global_region {
-       *     struct pipe_resource base;
-       *     int offset;
-       *     int size;
-       *   };
-       *
-       * and it describes the region [offset, offset + size) in GLOBAL
-       * resource.
-       */
-      struct pipe_resource *resources[PIPE_MAX_SHADER_RESOURCES];
-      uint32_t *handles[PIPE_MAX_SHADER_RESOURCES];
-      unsigned num_resources;
-   } global_binding;
+   unsigned sample_mask;
+
+   struct ilo_shader_state *fs;
+
+   const struct ilo_dsa_state *dsa;
+   struct pipe_stencil_ref stencil_ref;
+   const struct ilo_blend_state *blend;
+   struct pipe_blend_color blend_color;
+   struct ilo_fb_state fb;
+
+   /* shader resources */
+   struct ilo_sampler_state sampler[PIPE_SHADER_TYPES];
+   struct ilo_view_state view[PIPE_SHADER_TYPES];
+   struct ilo_cbuf_state cbuf[PIPE_SHADER_TYPES];
+   struct ilo_resource_state resource;
+
+   /* GPGPU */
+   struct ilo_shader_state *cs;
+   struct ilo_resource_state cs_resource;
+   struct ilo_global_binding global_binding;
 };
 
 static inline struct ilo_context *