ilo: EOL drop unmaintained gallium drv from buildsys
[mesa.git] / src / gallium / drivers / ilo / ilo_render_gen6.c
index 5816437ac0a7560374469728fa6af0bfdeaa8d74..910e6c0fb7ae3404878a2b70e88cc74fed99aad7 100644 (file)
  */
 
 #include "genhw/genhw.h"
-#include "util/u_dual_blend.h"
+#include "core/ilo_builder_3d.h"
+#include "core/ilo_builder_mi.h"
+#include "core/ilo_builder_render.h"
 #include "util/u_prim.h"
 
 #include "ilo_blitter.h"
-#include "ilo_builder_3d.h"
-#include "ilo_builder_mi.h"
-#include "ilo_builder_render.h"
 #include "ilo_query.h"
+#include "ilo_resource.h"
 #include "ilo_shader.h"
 #include "ilo_state.h"
-#include "ilo_render.h"
 #include "ilo_render_gen.h"
 
-/**
- * A wrapper for gen6_PIPE_CONTROL().
- */
-static inline void
-gen6_pipe_control(struct ilo_render *r, uint32_t dw1)
-{
-   struct intel_bo *bo = (dw1 & GEN6_PIPE_CONTROL_WRITE__MASK) ?
-      r->workaround_bo : NULL;
-
-   ILO_DEV_ASSERT(r->dev, 6, 6);
-
-   gen6_PIPE_CONTROL(r->builder, dw1, bo, 0, false);
-
-   r->state.current_pipe_control_dw1 |= dw1;
-
-   assert(!r->state.deferred_pipe_control_dw1);
-}
-
 /**
  * This should be called before PIPE_CONTROL.
  */
-static void
+void
 gen6_wa_pre_pipe_control(struct ilo_render *r, uint32_t dw1)
 {
    /*
@@ -107,14 +88,14 @@ gen6_wa_pre_pipe_control(struct ilo_render *r, uint32_t dw1)
       const uint32_t direct_wa = GEN6_PIPE_CONTROL_CS_STALL |
                                  GEN6_PIPE_CONTROL_PIXEL_SCOREBOARD_STALL;
 
-      gen6_pipe_control(r, direct_wa);
+      ilo_render_pipe_control(r, direct_wa);
    }
 
    if (indirect_wa_cond &&
        !(r->state.current_pipe_control_dw1 & GEN6_PIPE_CONTROL_WRITE__MASK)) {
       const uint32_t indirect_wa = GEN6_PIPE_CONTROL_WRITE_IMM;
 
-      gen6_pipe_control(r, indirect_wa);
+      ilo_render_pipe_control(r, indirect_wa);
    }
 }
 
@@ -130,6 +111,26 @@ gen6_wa_pre_non_pipelined(struct ilo_render *r)
    gen6_wa_pre_pipe_control(r, GEN6_PIPE_CONTROL_DEPTH_STALL);
 }
 
+static void
+gen6_wa_post_3dstate_urb_no_gs(struct ilo_render *r)
+{
+   /*
+    * From the Sandy Bridge PRM, volume 2 part 1, page 27:
+    *
+    *     "Because of a urb corruption caused by allocating a previous
+    *      gsunit's urb entry to vsunit software is required to send a
+    *      "GS NULL Fence" (Send URB fence with VS URB size == 1 and GS URB
+    *      size == 0) plus a dummy DRAW call before any case where VS will
+    *      be taking over GS URB space."
+    */
+   const uint32_t dw1 = GEN6_PIPE_CONTROL_CS_STALL;
+
+   if ((r->state.current_pipe_control_dw1 & dw1) != dw1)
+      gen6_wa_pre_pipe_control(r, dw1);
+   if ((r->state.current_pipe_control_dw1 & dw1) != dw1)
+      ilo_render_pipe_control(r, dw1);
+}
+
 static void
 gen6_wa_post_3dstate_constant_vs(struct ilo_render *r)
 {
@@ -142,10 +143,33 @@ gen6_wa_post_3dstate_constant_vs(struct ilo_render *r)
                         GEN6_PIPE_CONTROL_INSTRUCTION_CACHE_INVALIDATE |
                         GEN6_PIPE_CONTROL_STATE_CACHE_INVALIDATE;
 
-   gen6_wa_pre_pipe_control(r, dw1);
+   if ((r->state.current_pipe_control_dw1 & dw1) != dw1)
+      gen6_wa_pre_pipe_control(r, dw1);
+   if ((r->state.current_pipe_control_dw1 & dw1) != dw1)
+      ilo_render_pipe_control(r, dw1);
+}
 
+static void
+gen6_wa_pre_3dstate_vs_toggle(struct ilo_render *r)
+{
+   /*
+    * The classic driver has this undocumented WA:
+    *
+    * From the BSpec, 3D Pipeline > Geometry > Vertex Shader > State,
+    * 3DSTATE_VS, Dword 5.0 "VS Function Enable":
+    *
+    *   [DevSNB] A pipeline flush must be programmed prior to a 3DSTATE_VS
+    *   command that causes the VS Function Enable to toggle. Pipeline
+    *   flush can be executed by sending a PIPE_CONTROL command with CS
+    *   stall bit set and a post sync operation.
+    */
+   const uint32_t dw1 = GEN6_PIPE_CONTROL_WRITE_IMM |
+                        GEN6_PIPE_CONTROL_CS_STALL;
+
+   if ((r->state.current_pipe_control_dw1 & dw1) != dw1)
+      gen6_wa_pre_pipe_control(r, dw1);
    if ((r->state.current_pipe_control_dw1 & dw1) != dw1)
-      gen6_pipe_control(r, dw1);
+      ilo_render_pipe_control(r, dw1);
 }
 
 static void
@@ -162,10 +186,10 @@ gen6_wa_pre_3dstate_wm_max_threads(struct ilo_render *r)
 
    ILO_DEV_ASSERT(r->dev, 6, 6);
 
-   gen6_wa_pre_pipe_control(r, dw1);
-
    if ((r->state.current_pipe_control_dw1 & dw1) != dw1)
-      gen6_pipe_control(r, dw1);
+      gen6_wa_pre_pipe_control(r, dw1);
+   if ((r->state.current_pipe_control_dw1 & dw1) != dw1)
+      ilo_render_pipe_control(r, dw1);
 }
 
 static void
@@ -184,10 +208,10 @@ gen6_wa_pre_3dstate_multisample(struct ilo_render *r)
 
    ILO_DEV_ASSERT(r->dev, 6, 6);
 
-   gen6_wa_pre_pipe_control(r, dw1);
-
    if ((r->state.current_pipe_control_dw1 & dw1) != dw1)
-      gen6_pipe_control(r, dw1);
+      gen6_wa_pre_pipe_control(r, dw1);
+   if ((r->state.current_pipe_control_dw1 & dw1) != dw1)
+      ilo_render_pipe_control(r, dw1);
 }
 
 static void
@@ -213,9 +237,9 @@ gen6_wa_pre_depth(struct ilo_render *r)
    gen6_wa_pre_pipe_control(r, GEN6_PIPE_CONTROL_DEPTH_STALL |
                                GEN6_PIPE_CONTROL_DEPTH_CACHE_FLUSH);
 
-   gen6_pipe_control(r, GEN6_PIPE_CONTROL_DEPTH_STALL);
-   gen6_pipe_control(r, GEN6_PIPE_CONTROL_DEPTH_CACHE_FLUSH);
-   gen6_pipe_control(r, GEN6_PIPE_CONTROL_DEPTH_STALL);
+   ilo_render_pipe_control(r, GEN6_PIPE_CONTROL_DEPTH_STALL);
+   ilo_render_pipe_control(r, GEN6_PIPE_CONTROL_DEPTH_CACHE_FLUSH);
+   ilo_render_pipe_control(r, GEN6_PIPE_CONTROL_DEPTH_STALL);
 }
 
 #define DIRTY(state) (session->pipe_dirty & ILO_DIRTY_ ## state)
@@ -223,10 +247,10 @@ gen6_wa_pre_depth(struct ilo_render *r)
 void
 gen6_draw_common_select(struct ilo_render *r,
                         const struct ilo_state_vector *vec,
-                        struct gen6_draw_session *session)
+                        struct ilo_render_draw_session *session)
 {
    /* PIPELINE_SELECT */
-   if (session->hw_ctx_changed) {
+   if (r->hw_ctx_changed) {
       if (ilo_dev_gen(r->dev) == ILO_GEN(6))
          gen6_wa_pre_non_pipelined(r);
 
@@ -237,10 +261,10 @@ gen6_draw_common_select(struct ilo_render *r,
 void
 gen6_draw_common_sip(struct ilo_render *r,
                      const struct ilo_state_vector *vec,
-                     struct gen6_draw_session *session)
+                     struct ilo_render_draw_session *session)
 {
    /* STATE_SIP */
-   if (session->hw_ctx_changed) {
+   if (r->hw_ctx_changed) {
       if (ilo_dev_gen(r->dev) == ILO_GEN(6))
          gen6_wa_pre_non_pipelined(r);
 
@@ -251,15 +275,18 @@ gen6_draw_common_sip(struct ilo_render *r,
 void
 gen6_draw_common_base_address(struct ilo_render *r,
                               const struct ilo_state_vector *vec,
-                              struct gen6_draw_session *session)
+                              struct ilo_render_draw_session *session)
 {
    /* STATE_BASE_ADDRESS */
-   if (session->state_bo_changed || session->kernel_bo_changed ||
-       session->batch_bo_changed) {
+   if (r->state_bo_changed || r->instruction_bo_changed ||
+       r->batch_bo_changed) {
       if (ilo_dev_gen(r->dev) == ILO_GEN(6))
          gen6_wa_pre_non_pipelined(r);
 
-      gen6_state_base_address(r->builder, session->hw_ctx_changed);
+      if (ilo_dev_gen(r->dev) >= ILO_GEN(8))
+         gen8_state_base_address(r->builder, r->hw_ctx_changed);
+      else
+         gen6_state_base_address(r->builder, r->hw_ctx_changed);
 
       /*
        * From the Sandy Bridge PRM, volume 1 part 1, page 28:
@@ -276,109 +303,55 @@ gen6_draw_common_base_address(struct ilo_render *r,
        * 3DSTATE_SCISSOR_STATE_POINTERS is not on the list, but it is
        * reasonable to also reissue the command.  Same to PCB.
        */
-      session->viewport_state_changed = true;
+      session->viewport_changed = true;
 
-      session->cc_state_blend_changed = true;
-      session->cc_state_dsa_changed = true;
-      session->cc_state_cc_changed = true;
+      session->scissor_changed = true;
 
-      session->scissor_state_changed = true;
+      session->blend_changed = true;
+      session->dsa_changed = true;
+      session->cc_changed = true;
+
+      session->sampler_vs_changed = true;
+      session->sampler_gs_changed = true;
+      session->sampler_fs_changed = true;
+
+      session->pcb_vs_changed = true;
+      session->pcb_gs_changed = true;
+      session->pcb_fs_changed = true;
 
       session->binding_table_vs_changed = true;
       session->binding_table_gs_changed = true;
       session->binding_table_fs_changed = true;
-
-      session->sampler_state_vs_changed = true;
-      session->sampler_state_gs_changed = true;
-      session->sampler_state_fs_changed = true;
-
-      session->pcb_state_vs_changed = true;
-      session->pcb_state_gs_changed = true;
-      session->pcb_state_fs_changed = true;
    }
 }
 
 static void
 gen6_draw_common_urb(struct ilo_render *r,
                      const struct ilo_state_vector *vec,
-                     struct gen6_draw_session *session)
+                     struct ilo_render_draw_session *session)
 {
-   /* 3DSTATE_URB */
-   if (DIRTY(VE) || DIRTY(VS) || DIRTY(GS)) {
-      const bool gs_active = (vec->gs || (vec->vs &&
-               ilo_shader_get_kernel_param(vec->vs, ILO_KERNEL_VS_GEN6_SO)));
-      int vs_entry_size, gs_entry_size;
-      int vs_total_size, gs_total_size;
-
-      vs_entry_size = (vec->vs) ?
-         ilo_shader_get_kernel_param(vec->vs, ILO_KERNEL_OUTPUT_COUNT) : 0;
-
-      /*
-       * As indicated by 2e712e41db0c0676e9f30fc73172c0e8de8d84d4, VF and VS
-       * share VUE handles.  The VUE allocation size must be large enough to
-       * store either VF outputs (number of VERTEX_ELEMENTs) and VS outputs.
-       *
-       * I am not sure if the PRM explicitly states that VF and VS share VUE
-       * handles.  But here is a citation that implies so:
-       *
-       * From the Sandy Bridge PRM, volume 2 part 1, page 44:
-       *
-       *     "Once a FF stage that spawn threads has sufficient input to
-       *      initiate a thread, it must guarantee that it is safe to request
-       *      the thread initiation. For all these FF stages, this check is
-       *      based on :
-       *
-       *      - The availability of output URB entries:
-       *        - VS: As the input URB entries are overwritten with the
-       *          VS-generated output data, output URB availability isn't a
-       *          factor."
-       */
-      if (vs_entry_size < vec->ve->count)
-         vs_entry_size = vec->ve->count;
-
-      gs_entry_size = (vec->gs) ?
-         ilo_shader_get_kernel_param(vec->gs, ILO_KERNEL_OUTPUT_COUNT) :
-         (gs_active) ? vs_entry_size : 0;
+   const bool gs_active = (vec->gs || (vec->vs &&
+            ilo_shader_get_kernel_param(vec->vs, ILO_KERNEL_VS_GEN6_SO)));
 
-      /* in bytes */
-      vs_entry_size *= sizeof(float) * 4;
-      gs_entry_size *= sizeof(float) * 4;
-      vs_total_size = r->dev->urb_size;
-
-      if (gs_active) {
-         vs_total_size /= 2;
-         gs_total_size = vs_total_size;
-      }
-      else {
-         gs_total_size = 0;
-      }
-
-      gen6_3DSTATE_URB(r->builder, vs_total_size, gs_total_size,
-            vs_entry_size, gs_entry_size);
+   /* 3DSTATE_URB */
+   if (session->urb_delta.dirty & (ILO_STATE_URB_3DSTATE_URB_VS |
+                                   ILO_STATE_URB_3DSTATE_URB_GS)) {
+      gen6_3DSTATE_URB(r->builder, &vec->urb);
 
-      /*
-       * From the Sandy Bridge PRM, volume 2 part 1, page 27:
-       *
-       *     "Because of a urb corruption caused by allocating a previous
-       *      gsunit's urb entry to vsunit software is required to send a
-       *      "GS NULL Fence" (Send URB fence with VS URB size == 1 and GS URB
-       *      size == 0) plus a dummy DRAW call before any case where VS will
-       *      be taking over GS URB space."
-       */
       if (r->state.gs.active && !gs_active)
-         ilo_render_emit_flush_gen6(r);
-
-      r->state.gs.active = gs_active;
+         gen6_wa_post_3dstate_urb_no_gs(r);
    }
+
+   r->state.gs.active = gs_active;
 }
 
 static void
 gen6_draw_common_pointers_1(struct ilo_render *r,
                             const struct ilo_state_vector *vec,
-                            struct gen6_draw_session *session)
+                            struct ilo_render_draw_session *session)
 {
    /* 3DSTATE_VIEWPORT_STATE_POINTERS */
-   if (session->viewport_state_changed) {
+   if (session->viewport_changed) {
       gen6_3DSTATE_VIEWPORT_STATE_POINTERS(r->builder,
             r->state.CLIP_VIEWPORT,
             r->state.SF_VIEWPORT,
@@ -389,12 +362,12 @@ gen6_draw_common_pointers_1(struct ilo_render *r,
 static void
 gen6_draw_common_pointers_2(struct ilo_render *r,
                             const struct ilo_state_vector *vec,
-                            struct gen6_draw_session *session)
+                            struct ilo_render_draw_session *session)
 {
    /* 3DSTATE_CC_STATE_POINTERS */
-   if (session->cc_state_blend_changed ||
-       session->cc_state_dsa_changed ||
-       session->cc_state_cc_changed) {
+   if (session->blend_changed ||
+       session->dsa_changed ||
+       session->cc_changed) {
       gen6_3DSTATE_CC_STATE_POINTERS(r->builder,
             r->state.BLEND_STATE,
             r->state.DEPTH_STENCIL_STATE,
@@ -402,9 +375,9 @@ gen6_draw_common_pointers_2(struct ilo_render *r,
    }
 
    /* 3DSTATE_SAMPLER_STATE_POINTERS */
-   if (session->sampler_state_vs_changed ||
-       session->sampler_state_gs_changed ||
-       session->sampler_state_fs_changed) {
+   if (session->sampler_vs_changed ||
+       session->sampler_gs_changed ||
+       session->sampler_fs_changed) {
       gen6_3DSTATE_SAMPLER_STATE_POINTERS(r->builder,
             r->state.vs.SAMPLER_STATE,
             0,
@@ -415,10 +388,10 @@ gen6_draw_common_pointers_2(struct ilo_render *r,
 static void
 gen6_draw_common_pointers_3(struct ilo_render *r,
                             const struct ilo_state_vector *vec,
-                            struct gen6_draw_session *session)
+                            struct ilo_render_draw_session *session)
 {
    /* 3DSTATE_SCISSOR_STATE_POINTERS */
-   if (session->scissor_state_changed) {
+   if (session->scissor_changed) {
       gen6_3DSTATE_SCISSOR_STATE_POINTERS(r->builder,
             r->state.SCISSOR_RECT);
    }
@@ -437,141 +410,136 @@ gen6_draw_common_pointers_3(struct ilo_render *r,
 void
 gen6_draw_vf(struct ilo_render *r,
              const struct ilo_state_vector *vec,
-             struct gen6_draw_session *session)
+             struct ilo_render_draw_session *session)
 {
    if (ilo_dev_gen(r->dev) >= ILO_GEN(7.5)) {
       /* 3DSTATE_INDEX_BUFFER */
-      if (DIRTY(IB) || session->batch_bo_changed) {
-         gen6_3DSTATE_INDEX_BUFFER(r->builder,
-               &vec->ib, false);
-      }
+      if ((session->vf_delta.dirty & ILO_STATE_VF_3DSTATE_INDEX_BUFFER) ||
+          DIRTY(IB) || r->batch_bo_changed)
+         gen6_3DSTATE_INDEX_BUFFER(r->builder, &vec->ve->vf, &vec->ib.ib);
 
       /* 3DSTATE_VF */
-      if (session->primitive_restart_changed) {
-         gen7_3DSTATE_VF(r->builder, vec->draw->primitive_restart,
-               vec->draw->restart_index);
-      }
-   }
-   else {
+      if (session->vf_delta.dirty & ILO_STATE_VF_3DSTATE_VF)
+         gen75_3DSTATE_VF(r->builder, &vec->ve->vf);
+   } else {
       /* 3DSTATE_INDEX_BUFFER */
-      if (DIRTY(IB) || session->primitive_restart_changed ||
-          session->batch_bo_changed) {
-         gen6_3DSTATE_INDEX_BUFFER(r->builder,
-               &vec->ib, vec->draw->primitive_restart);
-      }
+      if ((session->vf_delta.dirty & ILO_STATE_VF_3DSTATE_INDEX_BUFFER) ||
+          DIRTY(IB) || r->batch_bo_changed)
+         gen6_3DSTATE_INDEX_BUFFER(r->builder, &vec->ve->vf, &vec->ib.ib);
    }
 
    /* 3DSTATE_VERTEX_BUFFERS */
-   if (DIRTY(VB) || DIRTY(VE) || session->batch_bo_changed)
-      gen6_3DSTATE_VERTEX_BUFFERS(r->builder, vec->ve, &vec->vb);
+   if ((session->vf_delta.dirty & ILO_STATE_VF_3DSTATE_VERTEX_BUFFERS) ||
+       DIRTY(VB) || DIRTY(VE) || r->batch_bo_changed) {
+      gen6_3DSTATE_VERTEX_BUFFERS(r->builder, &vec->ve->vf,
+            vec->vb.vb, vec->ve->vb_count);
+   }
 
    /* 3DSTATE_VERTEX_ELEMENTS */
-   if (DIRTY(VE) || DIRTY(VS)) {
-      const struct ilo_ve_state *ve = vec->ve;
-      bool last_velement_edgeflag = false;
-      bool prepend_generate_ids = false;
-
-      if (vec->vs) {
-         if (ilo_shader_get_kernel_param(vec->vs,
-                  ILO_KERNEL_VS_INPUT_EDGEFLAG)) {
-            /* we rely on the state tracker here */
-            assert(ilo_shader_get_kernel_param(vec->vs,
-                     ILO_KERNEL_INPUT_COUNT) == ve->count);
-
-            last_velement_edgeflag = true;
-         }
-
-         if (ilo_shader_get_kernel_param(vec->vs,
-                  ILO_KERNEL_VS_INPUT_INSTANCEID) ||
-             ilo_shader_get_kernel_param(vec->vs,
-                  ILO_KERNEL_VS_INPUT_VERTEXID))
-            prepend_generate_ids = true;
-      }
-
-      gen6_3DSTATE_VERTEX_ELEMENTS(r->builder, ve,
-            last_velement_edgeflag, prepend_generate_ids);
-   }
+   if (session->vf_delta.dirty & ILO_STATE_VF_3DSTATE_VERTEX_ELEMENTS)
+      gen6_3DSTATE_VERTEX_ELEMENTS(r->builder, &vec->ve->vf);
 }
 
 void
 gen6_draw_vf_statistics(struct ilo_render *r,
                         const struct ilo_state_vector *vec,
-                        struct gen6_draw_session *session)
+                        struct ilo_render_draw_session *session)
 {
    /* 3DSTATE_VF_STATISTICS */
-   if (session->hw_ctx_changed)
+   if (r->hw_ctx_changed)
       gen6_3DSTATE_VF_STATISTICS(r->builder, false);
 }
 
-static void
-gen6_draw_vf_draw(struct ilo_render *r,
-                  const struct ilo_state_vector *vec,
-                  struct gen6_draw_session *session)
-{
-   /* 3DPRIMITIVE */
-   gen6_3DPRIMITIVE(r->builder, vec->draw, &vec->ib);
-
-   r->state.current_pipe_control_dw1 = 0;
-   assert(!r->state.deferred_pipe_control_dw1);
-}
-
 void
 gen6_draw_vs(struct ilo_render *r,
              const struct ilo_state_vector *vec,
-             struct gen6_draw_session *session)
+             struct ilo_render_draw_session *session)
 {
-   const bool emit_3dstate_vs = (DIRTY(VS) || DIRTY(SAMPLER_VS) ||
-                                 session->kernel_bo_changed);
-   const bool emit_3dstate_constant_vs = session->pcb_state_vs_changed;
-
-   /*
-    * the classic i965 does this in upload_vs_state(), citing a spec that I
-    * cannot find
-    */
-   if (emit_3dstate_vs && ilo_dev_gen(r->dev) == ILO_GEN(6))
-      gen6_wa_pre_non_pipelined(r);
-
    /* 3DSTATE_CONSTANT_VS */
-   if (emit_3dstate_constant_vs) {
+   if (session->pcb_vs_changed) {
       gen6_3DSTATE_CONSTANT_VS(r->builder,
             &r->state.vs.PUSH_CONSTANT_BUFFER,
             &r->state.vs.PUSH_CONSTANT_BUFFER_size,
             1);
+
+      if (ilo_dev_gen(r->dev) == ILO_GEN(6))
+         gen6_wa_post_3dstate_constant_vs(r);
    }
 
    /* 3DSTATE_VS */
-   if (emit_3dstate_vs) {
-      const int num_samplers = vec->sampler[PIPE_SHADER_VERTEX].count;
+   if (DIRTY(VS) || r->instruction_bo_changed) {
+      const union ilo_shader_cso *cso = ilo_shader_get_kernel_cso(vec->vs);
+      const uint32_t kernel_offset = ilo_shader_get_kernel_offset(vec->vs);
 
-      gen6_3DSTATE_VS(r->builder, vec->vs, num_samplers);
-   }
+      if (ilo_dev_gen(r->dev) == ILO_GEN(6))
+         gen6_wa_pre_3dstate_vs_toggle(r);
 
-   if (emit_3dstate_constant_vs && ilo_dev_gen(r->dev) == ILO_GEN(6))
-      gen6_wa_post_3dstate_constant_vs(r);
+      if (ilo_dev_gen(r->dev) == ILO_GEN(6) &&
+          ilo_shader_get_kernel_param(vec->vs, ILO_KERNEL_VS_GEN6_SO)) {
+         gen6_3DSTATE_VS(r->builder, &cso->vs_sol.vs,
+               kernel_offset, r->vs_scratch.bo);
+      } else {
+         gen6_3DSTATE_VS(r->builder, &cso->vs,
+               kernel_offset, r->vs_scratch.bo);
+      }
+   }
 }
 
 static void
 gen6_draw_gs(struct ilo_render *r,
              const struct ilo_state_vector *vec,
-             struct gen6_draw_session *session)
+             struct ilo_render_draw_session *session)
 {
    /* 3DSTATE_CONSTANT_GS */
-   if (session->pcb_state_gs_changed)
+   if (session->pcb_gs_changed)
       gen6_3DSTATE_CONSTANT_GS(r->builder, NULL, NULL, 0);
 
    /* 3DSTATE_GS */
    if (DIRTY(GS) || DIRTY(VS) ||
-       session->prim_changed || session->kernel_bo_changed) {
-      const int verts_per_prim = u_vertices_per_prim(session->reduced_prim);
+       session->prim_changed || r->instruction_bo_changed) {
+      const union ilo_shader_cso *cso;
+      uint32_t kernel_offset;
+
+      if (vec->gs) {
+         cso = ilo_shader_get_kernel_cso(vec->gs);
+         kernel_offset = ilo_shader_get_kernel_offset(vec->gs);
+
+         gen6_3DSTATE_GS(r->builder, &cso->gs,
+               kernel_offset, r->gs_scratch.bo);
+      } else if (ilo_dev_gen(r->dev) == ILO_GEN(6) &&
+            ilo_shader_get_kernel_param(vec->vs, ILO_KERNEL_VS_GEN6_SO)) {
+         const int verts_per_prim =
+            u_vertices_per_prim(session->reduced_prim);
+         enum ilo_kernel_param param;
+
+         switch (verts_per_prim) {
+         case 1:
+            param = ILO_KERNEL_VS_GEN6_SO_POINT_OFFSET;
+            break;
+         case 2:
+            param = ILO_KERNEL_VS_GEN6_SO_LINE_OFFSET;
+            break;
+         default:
+            param = ILO_KERNEL_VS_GEN6_SO_TRI_OFFSET;
+            break;
+         }
+
+         cso = ilo_shader_get_kernel_cso(vec->vs);
+         kernel_offset = ilo_shader_get_kernel_offset(vec->vs) +
+            ilo_shader_get_kernel_param(vec->vs, param);
 
-      gen6_3DSTATE_GS(r->builder, vec->gs, vec->vs, verts_per_prim);
+         gen6_3DSTATE_GS(r->builder, &cso->vs_sol.sol,
+               kernel_offset, r->gs_scratch.bo);
+      } else {
+         gen6_3DSTATE_GS(r->builder, &vec->disabled_gs, 0, NULL);
+      }
    }
 }
 
 static bool
 gen6_draw_update_max_svbi(struct ilo_render *r,
                           const struct ilo_state_vector *vec,
-                          struct gen6_draw_session *session)
+                          struct ilo_render_draw_session *session)
 {
    if (DIRTY(VS) || DIRTY(GS) || DIRTY(SO)) {
       const struct pipe_stream_output_info *so_info =
@@ -615,7 +583,7 @@ gen6_draw_update_max_svbi(struct ilo_render *r,
 static void
 gen6_draw_gs_svbi(struct ilo_render *r,
                   const struct ilo_state_vector *vec,
-                  struct gen6_draw_session *session)
+                  struct ilo_render_draw_session *session)
 {
    const bool emit = gen6_draw_update_max_svbi(r, vec, session);
 
@@ -628,7 +596,7 @@ gen6_draw_gs_svbi(struct ilo_render *r,
             0, 0, r->state.so_max_vertices,
             false);
 
-      if (session->hw_ctx_changed) {
+      if (r->hw_ctx_changed) {
          int i;
 
          /*
@@ -651,46 +619,29 @@ gen6_draw_gs_svbi(struct ilo_render *r,
 void
 gen6_draw_clip(struct ilo_render *r,
                const struct ilo_state_vector *vec,
-               struct gen6_draw_session *session)
+               struct ilo_render_draw_session *session)
 {
    /* 3DSTATE_CLIP */
-   if (DIRTY(RASTERIZER) || DIRTY(FS) || DIRTY(VIEWPORT) || DIRTY(FB)) {
-      bool enable_guardband = true;
-      unsigned i;
-
-      /*
-       * We do not do 2D clipping yet.  Guard band test should only be enabled
-       * when the viewport is larger than the framebuffer.
-       */
-      for (i = 0; i < vec->viewport.count; i++) {
-         const struct ilo_viewport_cso *vp = &vec->viewport.cso[i];
-
-         if (vp->min_x > 0.0f || vp->max_x < vec->fb.state.width ||
-             vp->min_y > 0.0f || vp->max_y < vec->fb.state.height) {
-            enable_guardband = false;
-            break;
-         }
-      }
-
-      gen6_3DSTATE_CLIP(r->builder, vec->rasterizer,
-            vec->fs, enable_guardband, 1);
-   }
+   if (session->rs_delta.dirty & ILO_STATE_RASTER_3DSTATE_CLIP)
+      gen6_3DSTATE_CLIP(r->builder, &vec->rasterizer->rs);
 }
 
 static void
 gen6_draw_sf(struct ilo_render *r,
              const struct ilo_state_vector *vec,
-             struct gen6_draw_session *session)
+             struct ilo_render_draw_session *session)
 {
    /* 3DSTATE_SF */
-   if (DIRTY(RASTERIZER) || DIRTY(FS))
-      gen6_3DSTATE_SF(r->builder, vec->rasterizer, vec->fs);
+   if ((session->rs_delta.dirty & ILO_STATE_RASTER_3DSTATE_SF) || DIRTY(FS)) {
+      const struct ilo_state_sbe *sbe = ilo_shader_get_kernel_sbe(vec->fs);
+      gen6_3DSTATE_SF(r->builder, &vec->rasterizer->rs, sbe);
+   }
 }
 
 void
 gen6_draw_sf_rect(struct ilo_render *r,
                   const struct ilo_state_vector *vec,
-                  struct gen6_draw_session *session)
+                  struct ilo_render_draw_session *session)
 {
    /* 3DSTATE_DRAWING_RECTANGLE */
    if (DIRTY(FB)) {
@@ -705,10 +656,10 @@ gen6_draw_sf_rect(struct ilo_render *r,
 static void
 gen6_draw_wm(struct ilo_render *r,
              const struct ilo_state_vector *vec,
-             struct gen6_draw_session *session)
+             struct ilo_render_draw_session *session)
 {
    /* 3DSTATE_CONSTANT_PS */
-   if (session->pcb_state_fs_changed) {
+   if (session->pcb_fs_changed) {
       gen6_3DSTATE_CONSTANT_PS(r->builder,
             &r->state.wm.PUSH_CONSTANT_BUFFER,
             &r->state.wm.PUSH_CONSTANT_BUFFER_size,
@@ -716,55 +667,52 @@ gen6_draw_wm(struct ilo_render *r,
    }
 
    /* 3DSTATE_WM */
-   if (DIRTY(FS) || DIRTY(SAMPLER_FS) || DIRTY(BLEND) || DIRTY(DSA) ||
-       DIRTY(RASTERIZER) || session->kernel_bo_changed) {
-      const int num_samplers = vec->sampler[PIPE_SHADER_FRAGMENT].count;
-      const bool dual_blend = vec->blend->dual_blend;
-      const bool cc_may_kill = (vec->dsa->dw_alpha ||
-                                vec->blend->alpha_to_coverage);
-
-      if (ilo_dev_gen(r->dev) == ILO_GEN(6) && session->hw_ctx_changed)
+   if (DIRTY(FS) ||
+       (session->rs_delta.dirty & ILO_STATE_RASTER_3DSTATE_WM) ||
+       r->instruction_bo_changed) {
+      const union ilo_shader_cso *cso = ilo_shader_get_kernel_cso(vec->fs);
+      const uint32_t kernel_offset = ilo_shader_get_kernel_offset(vec->fs);
+
+      if (ilo_dev_gen(r->dev) == ILO_GEN(6) && r->hw_ctx_changed)
          gen6_wa_pre_3dstate_wm_max_threads(r);
 
-      gen6_3DSTATE_WM(r->builder, vec->fs, num_samplers,
-            vec->rasterizer, dual_blend, cc_may_kill, 0);
+      gen6_3DSTATE_WM(r->builder, &vec->rasterizer->rs,
+            &cso->ps, kernel_offset, r->fs_scratch.bo);
    }
 }
 
 static void
 gen6_draw_wm_multisample(struct ilo_render *r,
                          const struct ilo_state_vector *vec,
-                         struct gen6_draw_session *session)
+                         struct ilo_render_draw_session *session)
 {
-   /* 3DSTATE_MULTISAMPLE and 3DSTATE_SAMPLE_MASK */
-   if (DIRTY(SAMPLE_MASK) || DIRTY(FB)) {
-      const uint32_t *packed_sample_pos;
-
-      packed_sample_pos = (vec->fb.num_samples > 1) ?
-         &r->packed_sample_position_4x : &r->packed_sample_position_1x;
+   /* 3DSTATE_MULTISAMPLE */
+   if (DIRTY(FB) || (session->rs_delta.dirty &
+            ILO_STATE_RASTER_3DSTATE_MULTISAMPLE)) {
+      const uint8_t sample_count = (vec->fb.num_samples > 1) ? 4 : 1;
 
       if (ilo_dev_gen(r->dev) == ILO_GEN(6)) {
          gen6_wa_pre_non_pipelined(r);
          gen6_wa_pre_3dstate_multisample(r);
       }
 
-      gen6_3DSTATE_MULTISAMPLE(r->builder,
-            vec->fb.num_samples, packed_sample_pos,
-            vec->rasterizer->state.half_pixel_center);
-
-      gen6_3DSTATE_SAMPLE_MASK(r->builder,
-            (vec->fb.num_samples > 1) ? vec->sample_mask : 0x1);
+      gen6_3DSTATE_MULTISAMPLE(r->builder, &vec->rasterizer->rs,
+            &r->sample_pattern, sample_count);
    }
+
+   /* 3DSTATE_SAMPLE_MASK */
+   if (session->rs_delta.dirty & ILO_STATE_RASTER_3DSTATE_SAMPLE_MASK)
+      gen6_3DSTATE_SAMPLE_MASK(r->builder, &vec->rasterizer->rs);
 }
 
 static void
 gen6_draw_wm_depth(struct ilo_render *r,
                    const struct ilo_state_vector *vec,
-                   struct gen6_draw_session *session)
+                   struct ilo_render_draw_session *session)
 {
    /* 3DSTATE_DEPTH_BUFFER and 3DSTATE_CLEAR_PARAMS */
-   if (DIRTY(FB) || session->batch_bo_changed) {
-      const struct ilo_zs_surface *zs;
+   if (DIRTY(FB) || r->batch_bo_changed) {
+      const struct ilo_state_zs *zs;
       uint32_t clear_params;
 
       if (vec->fb.state.zsbuf) {
@@ -799,7 +747,7 @@ gen6_draw_wm_depth(struct ilo_render *r,
 void
 gen6_draw_wm_raster(struct ilo_render *r,
                     const struct ilo_state_vector *vec,
-                    struct gen6_draw_session *session)
+                    struct ilo_render_draw_session *session)
 {
    /* 3DSTATE_POLY_STIPPLE_PATTERN and 3DSTATE_POLY_STIPPLE_OFFSET */
    if ((DIRTY(RASTERIZER) || DIRTY(POLY_STIPPLE)) &&
@@ -807,10 +755,8 @@ gen6_draw_wm_raster(struct ilo_render *r,
       if (ilo_dev_gen(r->dev) == ILO_GEN(6))
          gen6_wa_pre_non_pipelined(r);
 
-      gen6_3DSTATE_POLY_STIPPLE_PATTERN(r->builder,
-            &vec->poly_stipple);
-
-      gen6_3DSTATE_POLY_STIPPLE_OFFSET(r->builder, 0, 0);
+      gen6_3DSTATE_POLY_STIPPLE_PATTERN(r->builder, &vec->poly_stipple);
+      gen6_3DSTATE_POLY_STIPPLE_OFFSET(r->builder, &vec->poly_stipple);
    }
 
    /* 3DSTATE_LINE_STIPPLE */
@@ -818,525 +764,28 @@ gen6_draw_wm_raster(struct ilo_render *r,
       if (ilo_dev_gen(r->dev) == ILO_GEN(6))
          gen6_wa_pre_non_pipelined(r);
 
-      gen6_3DSTATE_LINE_STIPPLE(r->builder,
-            vec->rasterizer->state.line_stipple_pattern,
-            vec->rasterizer->state.line_stipple_factor + 1);
+      gen6_3DSTATE_LINE_STIPPLE(r->builder, &vec->line_stipple);
    }
 
    /* 3DSTATE_AA_LINE_PARAMETERS */
-   if (DIRTY(RASTERIZER) && vec->rasterizer->state.line_smooth) {
+   if (session->rs_delta.dirty &
+         ILO_STATE_RASTER_3DSTATE_AA_LINE_PARAMETERS) {
       if (ilo_dev_gen(r->dev) == ILO_GEN(6))
          gen6_wa_pre_non_pipelined(r);
 
-      gen6_3DSTATE_AA_LINE_PARAMETERS(r->builder);
-   }
-}
-
-static void
-gen6_draw_state_viewports(struct ilo_render *r,
-                          const struct ilo_state_vector *vec,
-                          struct gen6_draw_session *session)
-{
-   /* SF_CLIP_VIEWPORT and CC_VIEWPORT */
-   if (ilo_dev_gen(r->dev) >= ILO_GEN(7) && DIRTY(VIEWPORT)) {
-      r->state.SF_CLIP_VIEWPORT = gen7_SF_CLIP_VIEWPORT(r->builder,
-            vec->viewport.cso, vec->viewport.count);
-
-      r->state.CC_VIEWPORT = gen6_CC_VIEWPORT(r->builder,
-            vec->viewport.cso, vec->viewport.count);
-
-      session->viewport_state_changed = true;
-   }
-   /* SF_VIEWPORT, CLIP_VIEWPORT, and CC_VIEWPORT */
-   else if (DIRTY(VIEWPORT)) {
-      r->state.CLIP_VIEWPORT = gen6_CLIP_VIEWPORT(r->builder,
-            vec->viewport.cso, vec->viewport.count);
-
-      r->state.SF_VIEWPORT = gen6_SF_VIEWPORT(r->builder,
-            vec->viewport.cso, vec->viewport.count);
-
-      r->state.CC_VIEWPORT = gen6_CC_VIEWPORT(r->builder,
-            vec->viewport.cso, vec->viewport.count);
-
-      session->viewport_state_changed = true;
-   }
-}
-
-static void
-gen6_draw_state_cc(struct ilo_render *r,
-                   const struct ilo_state_vector *vec,
-                   struct gen6_draw_session *session)
-{
-   /* BLEND_STATE */
-   if (DIRTY(BLEND) || DIRTY(FB) || DIRTY(DSA)) {
-      r->state.BLEND_STATE = gen6_BLEND_STATE(r->builder,
-            vec->blend, &vec->fb, vec->dsa);
-
-      session->cc_state_blend_changed = true;
-   }
-
-   /* COLOR_CALC_STATE */
-   if (DIRTY(DSA) || DIRTY(STENCIL_REF) || DIRTY(BLEND_COLOR)) {
-      r->state.COLOR_CALC_STATE =
-         gen6_COLOR_CALC_STATE(r->builder, &vec->stencil_ref,
-               vec->dsa->alpha_ref, &vec->blend_color);
-
-      session->cc_state_cc_changed = true;
-   }
-
-   /* DEPTH_STENCIL_STATE */
-   if (DIRTY(DSA)) {
-      r->state.DEPTH_STENCIL_STATE =
-         gen6_DEPTH_STENCIL_STATE(r->builder, vec->dsa);
-
-      session->cc_state_dsa_changed = true;
-   }
-}
-
-static void
-gen6_draw_state_scissors(struct ilo_render *r,
-                         const struct ilo_state_vector *vec,
-                         struct gen6_draw_session *session)
-{
-   /* SCISSOR_RECT */
-   if (DIRTY(SCISSOR) || DIRTY(VIEWPORT)) {
-      /* there should be as many scissors as there are viewports */
-      r->state.SCISSOR_RECT = gen6_SCISSOR_RECT(r->builder,
-            &vec->scissor, vec->viewport.count);
-
-      session->scissor_state_changed = true;
-   }
-}
-
-static void
-gen6_draw_state_surfaces_rt(struct ilo_render *r,
-                            const struct ilo_state_vector *vec,
-                            struct gen6_draw_session *session)
-{
-   /* SURFACE_STATEs for render targets */
-   if (DIRTY(FB)) {
-      const struct ilo_fb_state *fb = &vec->fb;
-      const int offset = ILO_WM_DRAW_SURFACE(0);
-      uint32_t *surface_state = &r->state.wm.SURFACE_STATE[offset];
-      int i;
-
-      for (i = 0; i < fb->state.nr_cbufs; i++) {
-         const struct ilo_surface_cso *surface =
-            (const struct ilo_surface_cso *) fb->state.cbufs[i];
-
-         if (!surface) {
-            surface_state[i] =
-               gen6_SURFACE_STATE(r->builder, &fb->null_rt, true);
-         }
-         else {
-            assert(surface && surface->is_rt);
-            surface_state[i] =
-               gen6_SURFACE_STATE(r->builder, &surface->u.rt, true);
-         }
-      }
-
-      /*
-       * Upload at least one render target, as
-       * brw_update_renderbuffer_surfaces() does.  I don't know why.
-       */
-      if (i == 0) {
-         surface_state[i] =
-            gen6_SURFACE_STATE(r->builder, &fb->null_rt, true);
-
-         i++;
-      }
-
-      memset(&surface_state[i], 0, (ILO_MAX_DRAW_BUFFERS - i) * 4);
-
-      if (i && session->num_surfaces[PIPE_SHADER_FRAGMENT] < offset + i)
-         session->num_surfaces[PIPE_SHADER_FRAGMENT] = offset + i;
-
-      session->binding_table_fs_changed = true;
-   }
-}
-
-static void
-gen6_draw_state_surfaces_so(struct ilo_render *r,
-                            const struct ilo_state_vector *vec,
-                            struct gen6_draw_session *session)
-{
-   const struct ilo_so_state *so = &vec->so;
-
-   if (ilo_dev_gen(r->dev) != ILO_GEN(6))
-      return;
-
-   /* SURFACE_STATEs for stream output targets */
-   if (DIRTY(VS) || DIRTY(GS) || DIRTY(SO)) {
-      const struct pipe_stream_output_info *so_info =
-         (vec->gs) ? ilo_shader_get_kernel_so_info(vec->gs) :
-         (vec->vs) ? ilo_shader_get_kernel_so_info(vec->vs) : NULL;
-      const int offset = ILO_GS_SO_SURFACE(0);
-      uint32_t *surface_state = &r->state.gs.SURFACE_STATE[offset];
-      int i;
-
-      for (i = 0; so_info && i < so_info->num_outputs; i++) {
-         const int target = so_info->output[i].output_buffer;
-         const struct pipe_stream_output_target *so_target =
-            (target < so->count) ? so->states[target] : NULL;
-
-         if (so_target) {
-            surface_state[i] = gen6_so_SURFACE_STATE(r->builder,
-                  so_target, so_info, i);
-         }
-         else {
-            surface_state[i] = 0;
-         }
-      }
-
-      memset(&surface_state[i], 0, (ILO_MAX_SO_BINDINGS - i) * 4);
-
-      if (i && session->num_surfaces[PIPE_SHADER_GEOMETRY] < offset + i)
-         session->num_surfaces[PIPE_SHADER_GEOMETRY] = offset + i;
-
-      session->binding_table_gs_changed = true;
-   }
-}
-
-static void
-gen6_draw_state_surfaces_view(struct ilo_render *r,
-                              const struct ilo_state_vector *vec,
-                              int shader_type,
-                              struct gen6_draw_session *session)
-{
-   const struct ilo_view_state *view = &vec->view[shader_type];
-   uint32_t *surface_state;
-   int offset, i;
-   bool skip = false;
-
-   /* SURFACE_STATEs for sampler views */
-   switch (shader_type) {
-   case PIPE_SHADER_VERTEX:
-      if (DIRTY(VIEW_VS)) {
-         offset = ILO_VS_TEXTURE_SURFACE(0);
-         surface_state = &r->state.vs.SURFACE_STATE[offset];
-
-         session->binding_table_vs_changed = true;
-      }
-      else {
-         skip = true;
-      }
-      break;
-   case PIPE_SHADER_FRAGMENT:
-      if (DIRTY(VIEW_FS)) {
-         offset = ILO_WM_TEXTURE_SURFACE(0);
-         surface_state = &r->state.wm.SURFACE_STATE[offset];
-
-         session->binding_table_fs_changed = true;
-      }
-      else {
-         skip = true;
-      }
-      break;
-   default:
-      skip = true;
-      break;
-   }
-
-   if (skip)
-      return;
-
-   for (i = 0; i < view->count; i++) {
-      if (view->states[i]) {
-         const struct ilo_view_cso *cso =
-            (const struct ilo_view_cso *) view->states[i];
-
-         surface_state[i] =
-            gen6_SURFACE_STATE(r->builder, &cso->surface, false);
-      }
-      else {
-         surface_state[i] = 0;
-      }
-   }
-
-   memset(&surface_state[i], 0, (ILO_MAX_SAMPLER_VIEWS - i) * 4);
-
-   if (i && session->num_surfaces[shader_type] < offset + i)
-      session->num_surfaces[shader_type] = offset + i;
-}
-
-static void
-gen6_draw_state_surfaces_const(struct ilo_render *r,
-                               const struct ilo_state_vector *vec,
-                               int shader_type,
-                               struct gen6_draw_session *session)
-{
-   const struct ilo_cbuf_state *cbuf = &vec->cbuf[shader_type];
-   uint32_t *surface_state;
-   bool *binding_table_changed;
-   int offset, count, i;
-
-   if (!DIRTY(CBUF))
-      return;
-
-   /* SURFACE_STATEs for constant buffers */
-   switch (shader_type) {
-   case PIPE_SHADER_VERTEX:
-      offset = ILO_VS_CONST_SURFACE(0);
-      surface_state = &r->state.vs.SURFACE_STATE[offset];
-      binding_table_changed = &session->binding_table_vs_changed;
-      break;
-   case PIPE_SHADER_FRAGMENT:
-      offset = ILO_WM_CONST_SURFACE(0);
-      surface_state = &r->state.wm.SURFACE_STATE[offset];
-      binding_table_changed = &session->binding_table_fs_changed;
-      break;
-   default:
-      return;
-      break;
-   }
-
-   /* constants are pushed via PCB */
-   if (cbuf->enabled_mask == 0x1 && !cbuf->cso[0].resource) {
-      memset(surface_state, 0, ILO_MAX_CONST_BUFFERS * 4);
-      return;
-   }
-
-   count = util_last_bit(cbuf->enabled_mask);
-   for (i = 0; i < count; i++) {
-      if (cbuf->cso[i].resource) {
-         surface_state[i] = gen6_SURFACE_STATE(r->builder,
-               &cbuf->cso[i].surface, false);
-      }
-      else {
-         surface_state[i] = 0;
-      }
-   }
-
-   memset(&surface_state[count], 0, (ILO_MAX_CONST_BUFFERS - count) * 4);
-
-   if (count && session->num_surfaces[shader_type] < offset + count)
-      session->num_surfaces[shader_type] = offset + count;
-
-   *binding_table_changed = true;
-}
-
-static void
-gen6_draw_state_binding_tables(struct ilo_render *r,
-                               const struct ilo_state_vector *vec,
-                               int shader_type,
-                               struct gen6_draw_session *session)
-{
-   uint32_t *binding_table_state, *surface_state;
-   int *binding_table_state_size, size;
-   bool skip = false;
-
-   /* BINDING_TABLE_STATE */
-   switch (shader_type) {
-   case PIPE_SHADER_VERTEX:
-      surface_state = r->state.vs.SURFACE_STATE;
-      binding_table_state = &r->state.vs.BINDING_TABLE_STATE;
-      binding_table_state_size = &r->state.vs.BINDING_TABLE_STATE_size;
-
-      skip = !session->binding_table_vs_changed;
-      break;
-   case PIPE_SHADER_GEOMETRY:
-      surface_state = r->state.gs.SURFACE_STATE;
-      binding_table_state = &r->state.gs.BINDING_TABLE_STATE;
-      binding_table_state_size = &r->state.gs.BINDING_TABLE_STATE_size;
-
-      skip = !session->binding_table_gs_changed;
-      break;
-   case PIPE_SHADER_FRAGMENT:
-      surface_state = r->state.wm.SURFACE_STATE;
-      binding_table_state = &r->state.wm.BINDING_TABLE_STATE;
-      binding_table_state_size = &r->state.wm.BINDING_TABLE_STATE_size;
-
-      skip = !session->binding_table_fs_changed;
-      break;
-   default:
-      skip = true;
-      break;
-   }
-
-   if (skip)
-      return;
-
-   /*
-    * If we have seemingly less SURFACE_STATEs than before, it could be that
-    * we did not touch those reside at the tail in this upload.  Loop over
-    * them to figure out the real number of SURFACE_STATEs.
-    */
-   for (size = *binding_table_state_size;
-         size > session->num_surfaces[shader_type]; size--) {
-      if (surface_state[size - 1])
-         break;
-   }
-   if (size < session->num_surfaces[shader_type])
-      size = session->num_surfaces[shader_type];
-
-   *binding_table_state = gen6_BINDING_TABLE_STATE(r->builder,
-         surface_state, size);
-   *binding_table_state_size = size;
-}
-
-static void
-gen6_draw_state_samplers(struct ilo_render *r,
-                         const struct ilo_state_vector *vec,
-                         int shader_type,
-                         struct gen6_draw_session *session)
-{
-   const struct ilo_sampler_cso * const *samplers =
-      vec->sampler[shader_type].cso;
-   const struct pipe_sampler_view * const *views =
-      (const struct pipe_sampler_view **) vec->view[shader_type].states;
-   const int num_samplers = vec->sampler[shader_type].count;
-   const int num_views = vec->view[shader_type].count;
-   uint32_t *sampler_state, *border_color_state;
-   bool emit_border_color = false;
-   bool skip = false;
-
-   /* SAMPLER_BORDER_COLOR_STATE and SAMPLER_STATE */
-   switch (shader_type) {
-   case PIPE_SHADER_VERTEX:
-      if (DIRTY(SAMPLER_VS) || DIRTY(VIEW_VS)) {
-         sampler_state = &r->state.vs.SAMPLER_STATE;
-         border_color_state = r->state.vs.SAMPLER_BORDER_COLOR_STATE;
-
-         if (DIRTY(SAMPLER_VS))
-            emit_border_color = true;
-
-         session->sampler_state_vs_changed = true;
-      }
-      else {
-         skip = true;
-      }
-      break;
-   case PIPE_SHADER_FRAGMENT:
-      if (DIRTY(SAMPLER_FS) || DIRTY(VIEW_FS)) {
-         sampler_state = &r->state.wm.SAMPLER_STATE;
-         border_color_state = r->state.wm.SAMPLER_BORDER_COLOR_STATE;
-
-         if (DIRTY(SAMPLER_FS))
-            emit_border_color = true;
-
-         session->sampler_state_fs_changed = true;
-      }
-      else {
-         skip = true;
-      }
-      break;
-   default:
-      skip = true;
-      break;
-   }
-
-   if (skip)
-      return;
-
-   if (emit_border_color) {
-      int i;
-
-      for (i = 0; i < num_samplers; i++) {
-         border_color_state[i] = (samplers[i]) ?
-            gen6_SAMPLER_BORDER_COLOR_STATE(r->builder, samplers[i]) : 0;
-      }
-   }
-
-   /* should we take the minimum of num_samplers and num_views? */
-   *sampler_state = gen6_SAMPLER_STATE(r->builder,
-         samplers, views,
-         border_color_state,
-         MIN2(num_samplers, num_views));
-}
-
-static void
-gen6_draw_state_pcb(struct ilo_render *r,
-                    const struct ilo_state_vector *vec,
-                    struct gen6_draw_session *session)
-{
-   /* push constant buffer for VS */
-   if (DIRTY(VS) || DIRTY(CBUF) || DIRTY(CLIP)) {
-      const int cbuf0_size = (vec->vs) ?
-            ilo_shader_get_kernel_param(vec->vs,
-                  ILO_KERNEL_PCB_CBUF0_SIZE) : 0;
-      const int clip_state_size = (vec->vs) ?
-            ilo_shader_get_kernel_param(vec->vs,
-                  ILO_KERNEL_VS_PCB_UCP_SIZE) : 0;
-      const int total_size = cbuf0_size + clip_state_size;
-
-      if (total_size) {
-         void *pcb;
-
-         r->state.vs.PUSH_CONSTANT_BUFFER =
-            gen6_push_constant_buffer(r->builder, total_size, &pcb);
-         r->state.vs.PUSH_CONSTANT_BUFFER_size = total_size;
-
-         if (cbuf0_size) {
-            const struct ilo_cbuf_state *cbuf =
-               &vec->cbuf[PIPE_SHADER_VERTEX];
-
-            if (cbuf0_size <= cbuf->cso[0].user_buffer_size) {
-               memcpy(pcb, cbuf->cso[0].user_buffer, cbuf0_size);
-            }
-            else {
-               memcpy(pcb, cbuf->cso[0].user_buffer,
-                     cbuf->cso[0].user_buffer_size);
-               memset(pcb + cbuf->cso[0].user_buffer_size, 0,
-                     cbuf0_size - cbuf->cso[0].user_buffer_size);
-            }
-
-            pcb += cbuf0_size;
-         }
-
-         if (clip_state_size)
-            memcpy(pcb, &vec->clip, clip_state_size);
-
-         session->pcb_state_vs_changed = true;
-      }
-      else if (r->state.vs.PUSH_CONSTANT_BUFFER_size) {
-         r->state.vs.PUSH_CONSTANT_BUFFER = 0;
-         r->state.vs.PUSH_CONSTANT_BUFFER_size = 0;
-
-         session->pcb_state_vs_changed = true;
-      }
-   }
-
-   /* push constant buffer for FS */
-   if (DIRTY(FS) || DIRTY(CBUF)) {
-      const int cbuf0_size = (vec->fs) ?
-         ilo_shader_get_kernel_param(vec->fs, ILO_KERNEL_PCB_CBUF0_SIZE) : 0;
-
-      if (cbuf0_size) {
-         const struct ilo_cbuf_state *cbuf = &vec->cbuf[PIPE_SHADER_FRAGMENT];
-         void *pcb;
-
-         r->state.wm.PUSH_CONSTANT_BUFFER =
-            gen6_push_constant_buffer(r->builder, cbuf0_size, &pcb);
-         r->state.wm.PUSH_CONSTANT_BUFFER_size = cbuf0_size;
-
-         if (cbuf0_size <= cbuf->cso[0].user_buffer_size) {
-            memcpy(pcb, cbuf->cso[0].user_buffer, cbuf0_size);
-         }
-         else {
-            memcpy(pcb, cbuf->cso[0].user_buffer,
-                  cbuf->cso[0].user_buffer_size);
-            memset(pcb + cbuf->cso[0].user_buffer_size, 0,
-                  cbuf0_size - cbuf->cso[0].user_buffer_size);
-         }
-
-         session->pcb_state_fs_changed = true;
-      }
-      else if (r->state.wm.PUSH_CONSTANT_BUFFER_size) {
-         r->state.wm.PUSH_CONSTANT_BUFFER = 0;
-         r->state.wm.PUSH_CONSTANT_BUFFER_size = 0;
-
-         session->pcb_state_fs_changed = true;
-      }
+      gen6_3DSTATE_AA_LINE_PARAMETERS(r->builder, &vec->rasterizer->rs);
    }
 }
 
 #undef DIRTY
 
-static void
-gen6_draw_commands(struct ilo_render *render,
-                   const struct ilo_state_vector *vec,
-                   struct gen6_draw_session *session)
+void
+ilo_render_emit_draw_commands_gen6(struct ilo_render *render,
+                                   const struct ilo_state_vector *vec,
+                                   struct ilo_render_draw_session *session)
 {
+   ILO_DEV_ASSERT(render->dev, 6, 6);
+
    /*
     * We try to keep the order of the commands match, as closely as possible,
     * that of the classic i965 driver.  It allows us to compare the command
@@ -1361,288 +810,46 @@ gen6_draw_commands(struct ilo_render *render,
    gen6_draw_wm_raster(render, vec, session);
    gen6_draw_sf_rect(render, vec, session);
    gen6_draw_vf(render, vec, session);
-   gen6_draw_vf_draw(render, vec, session);
-}
-
-void
-gen6_draw_states(struct ilo_render *render,
-                 const struct ilo_state_vector *vec,
-                 struct gen6_draw_session *session)
-{
-   int shader_type;
-
-   gen6_draw_state_viewports(render, vec, session);
-   gen6_draw_state_cc(render, vec, session);
-   gen6_draw_state_scissors(render, vec, session);
-   gen6_draw_state_pcb(render, vec, session);
-
-   /*
-    * upload all SURAFCE_STATEs together so that we know there are minimal
-    * paddings
-    */
-   gen6_draw_state_surfaces_rt(render, vec, session);
-   gen6_draw_state_surfaces_so(render, vec, session);
-   for (shader_type = 0; shader_type < PIPE_SHADER_TYPES; shader_type++) {
-      gen6_draw_state_surfaces_view(render, vec, shader_type, session);
-      gen6_draw_state_surfaces_const(render, vec, shader_type, session);
-   }
-
-   for (shader_type = 0; shader_type < PIPE_SHADER_TYPES; shader_type++) {
-      gen6_draw_state_samplers(render, vec, shader_type, session);
-      /* this must be called after all SURFACE_STATEs are uploaded */
-      gen6_draw_state_binding_tables(render, vec, shader_type, session);
-   }
-}
-
-void
-gen6_draw_prepare(const struct ilo_render *render,
-                  const struct ilo_state_vector *vec,
-                  struct gen6_draw_session *session)
-{
-   memset(session, 0, sizeof(*session));
-   session->pipe_dirty = vec->dirty;
-   session->reduced_prim = u_reduced_prim(vec->draw->mode);
-
-   session->hw_ctx_changed =
-      (render->invalidate_flags & ILO_RENDER_INVALIDATE_HW);
-
-   if (session->hw_ctx_changed) {
-      /* these should be enough to make everything uploaded */
-      session->batch_bo_changed = true;
-      session->state_bo_changed = true;
-      session->kernel_bo_changed = true;
-      session->prim_changed = true;
-      session->primitive_restart_changed = true;
-   } else {
-      /*
-       * Any state that involves resources needs to be re-emitted when the
-       * batch bo changed.  This is because we do not pin the resources and
-       * their offsets (or existence) may change between batch buffers.
-       */
-      session->batch_bo_changed =
-         (render->invalidate_flags & ILO_RENDER_INVALIDATE_BATCH_BO);
-
-      session->state_bo_changed =
-         (render->invalidate_flags & ILO_RENDER_INVALIDATE_STATE_BO);
-      session->kernel_bo_changed =
-         (render->invalidate_flags & ILO_RENDER_INVALIDATE_KERNEL_BO);
-      session->prim_changed =
-         (render->state.reduced_prim != session->reduced_prim);
-      session->primitive_restart_changed =
-         (render->state.primitive_restart != vec->draw->primitive_restart);
-   }
-}
-
-void
-gen6_draw_emit(struct ilo_render *render,
-               const struct ilo_state_vector *vec,
-               struct gen6_draw_session *session)
-{
-   /* force all states to be uploaded if the state bo changed */
-   if (session->state_bo_changed)
-      session->pipe_dirty = ILO_DIRTY_ALL;
-   else
-      session->pipe_dirty = vec->dirty;
-
-   session->emit_draw_states(render, vec, session);
-
-   /* force all commands to be uploaded if the HW context changed */
-   if (session->hw_ctx_changed)
-      session->pipe_dirty = ILO_DIRTY_ALL;
-   else
-      session->pipe_dirty = vec->dirty;
-
-   session->emit_draw_commands(render, vec, session);
-}
-
-void
-gen6_draw_end(struct ilo_render *render,
-              const struct ilo_state_vector *vec,
-              struct gen6_draw_session *session)
-{
-   render->state.reduced_prim = session->reduced_prim;
-   render->state.primitive_restart = vec->draw->primitive_restart;
-}
-
-static void
-ilo_render_emit_draw_gen6(struct ilo_render *render,
-                          const struct ilo_state_vector *vec)
-{
-   struct gen6_draw_session session;
-
-   gen6_draw_prepare(render, vec, &session);
 
-   session.emit_draw_states = gen6_draw_states;
-   session.emit_draw_commands = gen6_draw_commands;
-
-   gen6_draw_emit(render, vec, &session);
-   gen6_draw_end(render, vec, &session);
-}
-
-void
-ilo_render_emit_flush_gen6(struct ilo_render *r)
-{
-   const uint32_t dw1 = GEN6_PIPE_CONTROL_INSTRUCTION_CACHE_INVALIDATE |
-                        GEN6_PIPE_CONTROL_RENDER_CACHE_FLUSH |
-                        GEN6_PIPE_CONTROL_DEPTH_CACHE_FLUSH |
-                        GEN6_PIPE_CONTROL_VF_CACHE_INVALIDATE |
-                        GEN6_PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE |
-                        GEN6_PIPE_CONTROL_CS_STALL;
-
-   ILO_DEV_ASSERT(r->dev, 6, 7.5);
-
-   if (ilo_dev_gen(r->dev) == ILO_GEN(6))
-      gen6_wa_pre_pipe_control(r, dw1);
-
-   gen6_PIPE_CONTROL(r->builder, dw1, NULL, 0, false);
-
-   r->state.current_pipe_control_dw1 |= dw1;
-   r->state.deferred_pipe_control_dw1 &= ~dw1;
-}
-
-void
-ilo_render_emit_query_gen6(struct ilo_render *r,
-                           struct ilo_query *q, uint32_t offset)
-{
-   const uint32_t pipeline_statistics_regs[] = {
-      GEN6_REG_IA_VERTICES_COUNT,
-      GEN6_REG_IA_PRIMITIVES_COUNT,
-      GEN6_REG_VS_INVOCATION_COUNT,
-      GEN6_REG_GS_INVOCATION_COUNT,
-      GEN6_REG_GS_PRIMITIVES_COUNT,
-      GEN6_REG_CL_INVOCATION_COUNT,
-      GEN6_REG_CL_PRIMITIVES_COUNT,
-      GEN6_REG_PS_INVOCATION_COUNT,
-      (ilo_dev_gen(r->dev) >= ILO_GEN(7)) ? GEN7_REG_HS_INVOCATION_COUNT : 0,
-      (ilo_dev_gen(r->dev) >= ILO_GEN(7)) ? GEN7_REG_DS_INVOCATION_COUNT : 0,
-      0,
-   };
-   const uint32_t primitives_generated_reg =
-      (ilo_dev_gen(r->dev) >= ILO_GEN(7) && q->index > 0) ?
-      GEN7_REG_SO_PRIM_STORAGE_NEEDED(q->index) :
-      GEN6_REG_CL_INVOCATION_COUNT;
-   const uint32_t primitives_emitted_reg =
-      (ilo_dev_gen(r->dev) >= ILO_GEN(7)) ?
-      GEN7_REG_SO_NUM_PRIMS_WRITTEN(q->index) :
-      GEN6_REG_SO_NUM_PRIMS_WRITTEN;
-   const uint32_t *regs;
-   int reg_count = 0, i;
-   uint32_t pipe_control_dw1 = 0;
-
-   ILO_DEV_ASSERT(r->dev, 6, 7.5);
-
-   switch (q->type) {
-   case PIPE_QUERY_OCCLUSION_COUNTER:
-      pipe_control_dw1 = GEN6_PIPE_CONTROL_DEPTH_STALL |
-                         GEN6_PIPE_CONTROL_WRITE_PS_DEPTH_COUNT;
-      break;
-   case PIPE_QUERY_TIMESTAMP:
-   case PIPE_QUERY_TIME_ELAPSED:
-      pipe_control_dw1 = GEN6_PIPE_CONTROL_WRITE_TIMESTAMP;
-      break;
-   case PIPE_QUERY_PRIMITIVES_GENERATED:
-      regs = &primitives_generated_reg;
-      reg_count = 1;
-      break;
-   case PIPE_QUERY_PRIMITIVES_EMITTED:
-      regs = &primitives_emitted_reg;
-      reg_count = 1;
-      break;
-   case PIPE_QUERY_PIPELINE_STATISTICS:
-      regs = pipeline_statistics_regs;
-      reg_count = Elements(pipeline_statistics_regs);
-      break;
-   default:
-      break;
-   }
-
-   if (pipe_control_dw1) {
-      if (ilo_dev_gen(r->dev) == ILO_GEN(6))
-         gen6_wa_pre_pipe_control(r, pipe_control_dw1);
-
-      gen6_PIPE_CONTROL(r->builder, pipe_control_dw1, q->bo, offset, true);
-
-      r->state.current_pipe_control_dw1 |= pipe_control_dw1;
-      r->state.deferred_pipe_control_dw1 &= ~pipe_control_dw1;
-   }
-
-   if (!reg_count)
-      return;
-
-   r->emit_flush(r);
-
-   for (i = 0; i < reg_count; i++) {
-      if (regs[i]) {
-         /* store lower 32 bits */
-         gen6_MI_STORE_REGISTER_MEM(r->builder, q->bo, offset, regs[i]);
-         /* store higher 32 bits */
-         gen6_MI_STORE_REGISTER_MEM(r->builder, q->bo,
-               offset + 4, regs[i] + 4);
-      } else {
-         gen6_MI_STORE_DATA_IMM(r->builder, q->bo, offset, 0, true);
-      }
-
-      offset += 8;
-   }
+   ilo_render_3dprimitive(render, &vec->draw_info);
 }
 
 static void
 gen6_rectlist_vs_to_sf(struct ilo_render *r,
-                       const struct ilo_blitter *blitter,
-                       struct gen6_rectlist_session *session)
+                       const struct ilo_blitter *blitter)
 {
    gen6_3DSTATE_CONSTANT_VS(r->builder, NULL, NULL, 0);
-   gen6_3DSTATE_VS(r->builder, NULL, 0);
-
    gen6_wa_post_3dstate_constant_vs(r);
 
+   gen6_wa_pre_3dstate_vs_toggle(r);
+   gen6_3DSTATE_VS(r->builder, &blitter->vs, 0, NULL);
+
    gen6_3DSTATE_CONSTANT_GS(r->builder, NULL, NULL, 0);
-   gen6_3DSTATE_GS(r->builder, NULL, NULL, 0);
+   gen6_3DSTATE_GS(r->builder, &blitter->gs, 0, NULL);
 
-   gen6_3DSTATE_CLIP(r->builder, NULL, NULL, false, 0);
-   gen6_3DSTATE_SF(r->builder, NULL, NULL);
+   gen6_3DSTATE_CLIP(r->builder, &blitter->fb.rs);
+   gen6_3DSTATE_SF(r->builder, &blitter->fb.rs, &blitter->sbe);
 }
 
 static void
 gen6_rectlist_wm(struct ilo_render *r,
-                 const struct ilo_blitter *blitter,
-                 struct gen6_rectlist_session *session)
+                 const struct ilo_blitter *blitter)
 {
-   uint32_t hiz_op;
-
-   switch (blitter->op) {
-   case ILO_BLITTER_RECTLIST_CLEAR_ZS:
-      hiz_op = GEN6_WM_DW4_DEPTH_CLEAR;
-      break;
-   case ILO_BLITTER_RECTLIST_RESOLVE_Z:
-      hiz_op = GEN6_WM_DW4_DEPTH_RESOLVE;
-      break;
-   case ILO_BLITTER_RECTLIST_RESOLVE_HIZ:
-      hiz_op = GEN6_WM_DW4_HIZ_RESOLVE;
-      break;
-   default:
-      hiz_op = 0;
-      break;
-   }
-
    gen6_3DSTATE_CONSTANT_PS(r->builder, NULL, NULL, 0);
 
    gen6_wa_pre_3dstate_wm_max_threads(r);
-   gen6_3DSTATE_WM(r->builder, NULL, 0, NULL, false, false, hiz_op);
+   gen6_3DSTATE_WM(r->builder, &blitter->fb.rs, &blitter->ps, 0, NULL);
 }
 
 static void
 gen6_rectlist_wm_depth(struct ilo_render *r,
-                       const struct ilo_blitter *blitter,
-                       struct gen6_rectlist_session *session)
+                       const struct ilo_blitter *blitter)
 {
    gen6_wa_pre_depth(r);
 
    if (blitter->uses & (ILO_BLITTER_USE_FB_DEPTH |
-                        ILO_BLITTER_USE_FB_STENCIL)) {
-      gen6_3DSTATE_DEPTH_BUFFER(r->builder,
-            &blitter->fb.dst.u.zs);
-   }
+                        ILO_BLITTER_USE_FB_STENCIL))
+      gen6_3DSTATE_DEPTH_BUFFER(r->builder, &blitter->fb.dst.u.zs);
 
    if (blitter->uses & ILO_BLITTER_USE_FB_DEPTH) {
       gen6_3DSTATE_HIER_DEPTH_BUFFER(r->builder,
@@ -1660,112 +867,87 @@ gen6_rectlist_wm_depth(struct ilo_render *r,
 
 static void
 gen6_rectlist_wm_multisample(struct ilo_render *r,
-                             const struct ilo_blitter *blitter,
-                             struct gen6_rectlist_session *session)
+                             const struct ilo_blitter *blitter)
 {
-   const uint32_t *packed_sample_pos = (blitter->fb.num_samples > 1) ?
-      &r->packed_sample_position_4x : &r->packed_sample_position_1x;
+   const uint8_t sample_count = (blitter->fb.num_samples > 1) ? 4 : 1;
 
    gen6_wa_pre_3dstate_multisample(r);
 
-   gen6_3DSTATE_MULTISAMPLE(r->builder, blitter->fb.num_samples,
-         packed_sample_pos, true);
+   gen6_3DSTATE_MULTISAMPLE(r->builder, &blitter->fb.rs, &r->sample_pattern, sample_count);
+   gen6_3DSTATE_SAMPLE_MASK(r->builder, &blitter->fb.rs);
+}
 
-   gen6_3DSTATE_SAMPLE_MASK(r->builder,
-         (1 << blitter->fb.num_samples) - 1);
+int
+ilo_render_get_rectlist_commands_len_gen6(const struct ilo_render *render,
+                                          const struct ilo_blitter *blitter)
+{
+   ILO_DEV_ASSERT(render->dev, 6, 7.5);
+
+   return 256;
 }
 
-static void
-gen6_rectlist_commands(struct ilo_render *r,
-                       const struct ilo_blitter *blitter,
-                       struct gen6_rectlist_session *session)
+void
+ilo_render_emit_rectlist_commands_gen6(struct ilo_render *r,
+                                       const struct ilo_blitter *blitter,
+                                       const struct ilo_render_rectlist_session *session)
 {
+   ILO_DEV_ASSERT(r->dev, 6, 6);
+
    gen6_wa_pre_non_pipelined(r);
 
-   gen6_rectlist_wm_multisample(r, blitter, session);
+   gen6_rectlist_wm_multisample(r, blitter);
 
    gen6_state_base_address(r->builder, true);
 
-   gen6_3DSTATE_VERTEX_BUFFERS(r->builder,
-         &blitter->ve, &blitter->vb);
+   gen6_user_3DSTATE_VERTEX_BUFFERS(r->builder,
+         session->vb_start, session->vb_end,
+         sizeof(blitter->vertices[0]));
 
-   gen6_3DSTATE_VERTEX_ELEMENTS(r->builder,
-         &blitter->ve, false, false);
+   gen6_3DSTATE_VERTEX_ELEMENTS(r->builder, &blitter->vf);
+
+   gen6_3DSTATE_URB(r->builder, &blitter->urb);
 
-   gen6_3DSTATE_URB(r->builder,
-         r->dev->urb_size, 0, blitter->ve.count * 4 * sizeof(float), 0);
-   /* 3DSTATE_URB workaround */
    if (r->state.gs.active) {
-      ilo_render_emit_flush_gen6(r);
+      gen6_wa_post_3dstate_urb_no_gs(r);
       r->state.gs.active = false;
    }
 
    if (blitter->uses &
        (ILO_BLITTER_USE_DSA | ILO_BLITTER_USE_CC)) {
       gen6_3DSTATE_CC_STATE_POINTERS(r->builder, 0,
-            session->DEPTH_STENCIL_STATE, session->COLOR_CALC_STATE);
+            r->state.DEPTH_STENCIL_STATE, r->state.COLOR_CALC_STATE);
    }
 
-   gen6_rectlist_vs_to_sf(r, blitter, session);
-   gen6_rectlist_wm(r, blitter, session);
+   gen6_rectlist_vs_to_sf(r, blitter);
+   gen6_rectlist_wm(r, blitter);
 
    if (blitter->uses & ILO_BLITTER_USE_VIEWPORT) {
       gen6_3DSTATE_VIEWPORT_STATE_POINTERS(r->builder,
-            0, 0, session->CC_VIEWPORT);
+            0, 0, r->state.CC_VIEWPORT);
    }
 
-   gen6_rectlist_wm_depth(r, blitter, session);
+   gen6_rectlist_wm_depth(r, blitter);
 
    gen6_3DSTATE_DRAWING_RECTANGLE(r->builder, 0, 0,
          blitter->fb.width, blitter->fb.height);
 
-   gen6_3DPRIMITIVE(r->builder, &blitter->draw, NULL);
-}
-
-static void
-gen6_rectlist_states(struct ilo_render *r,
-                     const struct ilo_blitter *blitter,
-                     struct gen6_rectlist_session *session)
-{
-   if (blitter->uses & ILO_BLITTER_USE_DSA) {
-      session->DEPTH_STENCIL_STATE =
-         gen6_DEPTH_STENCIL_STATE(r->builder, &blitter->dsa);
-   }
-
-   if (blitter->uses & ILO_BLITTER_USE_CC) {
-      session->COLOR_CALC_STATE =
-         gen6_COLOR_CALC_STATE(r->builder, &blitter->cc.stencil_ref,
-               blitter->cc.alpha_ref, &blitter->cc.blend_color);
-   }
-
-   if (blitter->uses & ILO_BLITTER_USE_VIEWPORT) {
-      session->CC_VIEWPORT =
-         gen6_CC_VIEWPORT(r->builder, &blitter->viewport, 1);
-   }
+   ilo_render_3dprimitive(r, &blitter->draw_info);
 }
 
-static void
-ilo_render_emit_rectlist_gen6(struct ilo_render *render,
-                              const struct ilo_blitter *blitter)
+int
+ilo_render_get_draw_commands_len_gen6(const struct ilo_render *render,
+                                      const struct ilo_state_vector *vec)
 {
-   struct gen6_rectlist_session session;
-
-   memset(&session, 0, sizeof(session));
-   gen6_rectlist_states(render, blitter, &session);
-   gen6_rectlist_commands(render, blitter, &session);
-}
+   static int len;
 
-static int
-gen6_render_max_command_size(const struct ilo_render *render)
-{
-   static int size;
+   ILO_DEV_ASSERT(render->dev, 6, 6);
 
-   if (!size) {
-      size += GEN6_3DSTATE_CONSTANT_ANY__SIZE * 3;
-      size += GEN6_3DSTATE_GS_SVB_INDEX__SIZE * 4;
-      size += GEN6_PIPE_CONTROL__SIZE * 5;
+   if (!len) {
+      len += GEN6_3DSTATE_CONSTANT_ANY__SIZE * 3;
+      len += GEN6_3DSTATE_GS_SVB_INDEX__SIZE * 4;
+      len += GEN6_PIPE_CONTROL__SIZE * 5;
 
-      size +=
+      len +=
          GEN6_STATE_BASE_ADDRESS__SIZE +
          GEN6_STATE_SIP__SIZE +
          GEN6_3DSTATE_VF_STATISTICS__SIZE +
@@ -1798,214 +980,5 @@ gen6_render_max_command_size(const struct ilo_render *render)
          GEN6_3DPRIMITIVE__SIZE;
    }
 
-   return size;
-}
-
-int
-gen6_render_estimate_state_size(const struct ilo_render *render,
-                                const struct ilo_state_vector *vec)
-{
-   static int static_size;
-   int sh_type, size;
-
-   if (!static_size) {
-      /* 64 bytes, or 16 dwords */
-      const int alignment = 64 / 4;
-
-      /* pad first */
-      size = alignment - 1;
-
-      /* CC states */
-      size += align(GEN6_BLEND_STATE__SIZE * ILO_MAX_DRAW_BUFFERS, alignment);
-      size += align(GEN6_DEPTH_STENCIL_STATE__SIZE, alignment);
-      size += align(GEN6_COLOR_CALC_STATE__SIZE, alignment);
-
-      /* viewport arrays */
-      if (ilo_dev_gen(render->dev) >= ILO_GEN(7)) {
-         size +=
-            align(GEN7_SF_CLIP_VIEWPORT__SIZE * ILO_MAX_VIEWPORTS, 16) +
-            align(GEN6_CC_VIEWPORT__SIZE * ILO_MAX_VIEWPORTS, 8) +
-            align(GEN6_SCISSOR_RECT__SIZE * ILO_MAX_VIEWPORTS, 8);
-      }
-      else {
-         size +=
-            align(GEN6_SF_VIEWPORT__SIZE * ILO_MAX_VIEWPORTS, 8) +
-            align(GEN6_CLIP_VIEWPORT__SIZE * ILO_MAX_VIEWPORTS, 8) +
-            align(GEN6_CC_VIEWPORT__SIZE * ILO_MAX_VIEWPORTS, 8) +
-            align(GEN6_SCISSOR_RECT__SIZE * ILO_MAX_VIEWPORTS, 8);
-      }
-
-      static_size = size;
-   }
-
-   size = static_size;
-
-   for (sh_type = 0; sh_type < PIPE_SHADER_TYPES; sh_type++) {
-      const int alignment = 32 / 4;
-      int num_samplers, num_surfaces, pcb_size;
-
-      /* samplers */
-      num_samplers = vec->sampler[sh_type].count;
-
-      /* sampler views and constant buffers */
-      num_surfaces = vec->view[sh_type].count +
-         util_bitcount(vec->cbuf[sh_type].enabled_mask);
-
-      pcb_size = 0;
-
-      switch (sh_type) {
-      case PIPE_SHADER_VERTEX:
-         if (vec->vs) {
-            if (ilo_dev_gen(render->dev) == ILO_GEN(6)) {
-               const struct pipe_stream_output_info *so_info =
-                  ilo_shader_get_kernel_so_info(vec->vs);
-
-               /* stream outputs */
-               num_surfaces += so_info->num_outputs;
-            }
-
-            pcb_size = ilo_shader_get_kernel_param(vec->vs,
-                  ILO_KERNEL_PCB_CBUF0_SIZE);
-            pcb_size += ilo_shader_get_kernel_param(vec->vs,
-                  ILO_KERNEL_VS_PCB_UCP_SIZE);
-         }
-         break;
-      case PIPE_SHADER_GEOMETRY:
-         if (vec->gs && ilo_dev_gen(render->dev) == ILO_GEN(6)) {
-            const struct pipe_stream_output_info *so_info =
-               ilo_shader_get_kernel_so_info(vec->gs);
-
-            /* stream outputs */
-            num_surfaces += so_info->num_outputs;
-         }
-         break;
-      case PIPE_SHADER_FRAGMENT:
-         /* render targets */
-         num_surfaces += vec->fb.state.nr_cbufs;
-
-         if (vec->fs) {
-            pcb_size = ilo_shader_get_kernel_param(vec->fs,
-                  ILO_KERNEL_PCB_CBUF0_SIZE);
-         }
-         break;
-      default:
-         break;
-      }
-
-      /* SAMPLER_STATE array and SAMPLER_BORDER_COLORs */
-      if (num_samplers) {
-         size += align(GEN6_SAMPLER_STATE__SIZE * num_samplers, alignment) +
-            align(GEN6_SAMPLER_BORDER_COLOR__SIZE, alignment) * num_samplers;
-      }
-
-      /* BINDING_TABLE_STATE and SURFACE_STATEs */
-      if (num_surfaces) {
-         size += align(num_surfaces, alignment) +
-            align(GEN6_SURFACE_STATE__SIZE, alignment) * num_surfaces;
-      }
-
-      /* PCB */
-      if (pcb_size)
-         size += align(pcb_size, alignment);
-   }
-
-   return size;
-}
-
-int
-gen6_render_estimate_query_size(const struct ilo_render *render,
-                                const struct ilo_query *q)
-{
-   int size;
-
-   ILO_DEV_ASSERT(render->dev, 6, 7.5);
-
-   switch (q->type) {
-   case PIPE_QUERY_OCCLUSION_COUNTER:
-      size = GEN6_PIPE_CONTROL__SIZE;
-      if (ilo_dev_gen(render->dev) == ILO_GEN(6))
-         size *= 3;
-      break;
-   case PIPE_QUERY_TIMESTAMP:
-   case PIPE_QUERY_TIME_ELAPSED:
-      size = GEN6_PIPE_CONTROL__SIZE;
-      if (ilo_dev_gen(render->dev) == ILO_GEN(6))
-         size *= 2;
-      break;
-   case PIPE_QUERY_PRIMITIVES_GENERATED:
-   case PIPE_QUERY_PRIMITIVES_EMITTED:
-      size = GEN6_PIPE_CONTROL__SIZE;
-      if (ilo_dev_gen(render->dev) == ILO_GEN(6))
-         size *= 3;
-
-      size += GEN6_MI_STORE_REGISTER_MEM__SIZE * 2;
-      break;
-   case PIPE_QUERY_PIPELINE_STATISTICS:
-      if (ilo_dev_gen(render->dev) >= ILO_GEN(7)) {
-         const int num_regs = 10;
-         const int num_pads = 1;
-
-         size = GEN6_PIPE_CONTROL__SIZE +
-            GEN6_MI_STORE_REGISTER_MEM__SIZE * 2 * num_regs +
-            GEN6_MI_STORE_DATA_IMM__SIZE * num_pads;
-      } else {
-         const int num_regs = 8;
-         const int num_pads = 3;
-
-         size = GEN6_PIPE_CONTROL__SIZE * 3 +
-            GEN6_MI_STORE_REGISTER_MEM__SIZE * 2 * num_regs +
-            GEN6_MI_STORE_DATA_IMM__SIZE * num_pads;
-      }
-      break;
-   default:
-      size = 0;
-      break;
-   }
-
-   return size;
-}
-
-static int
-ilo_render_estimate_size_gen6(struct ilo_render *render,
-                              enum ilo_render_action action,
-                              const void *arg)
-{
-   int size;
-
-   switch (action) {
-   case ILO_RENDER_DRAW:
-      {
-         const struct ilo_state_vector *ilo = arg;
-
-         size = gen6_render_max_command_size(render) +
-            gen6_render_estimate_state_size(render, ilo);
-      }
-      break;
-   case ILO_RENDER_FLUSH:
-      size = GEN6_PIPE_CONTROL__SIZE * 3;
-      break;
-   case ILO_RENDER_QUERY:
-      size = gen6_render_estimate_query_size(render,
-            (const struct ilo_query *) arg);
-      break;
-   case ILO_RENDER_RECTLIST:
-      size = 64 + 256; /* states + commands */
-      break;
-   default:
-      assert(!"unknown render action");
-      size = 0;
-      break;
-   }
-
-   return size;
-}
-
-void
-ilo_render_init_gen6(struct ilo_render *render)
-{
-   render->estimate_size = ilo_render_estimate_size_gen6;
-   render->emit_draw = ilo_render_emit_draw_gen6;
-   render->emit_flush = ilo_render_emit_flush_gen6;
-   render->emit_query = ilo_render_emit_query_gen6;
-   render->emit_rectlist = ilo_render_emit_rectlist_gen6;
+   return len;
 }