radeonsi: try to fix IA_MULTI_VGT_PARAM programming
[mesa.git] / src / gallium / drivers / radeonsi / si_state_draw.c
index c49091d845bdb4064d755da8080ab03f217237e0..1467bb69d4be90800d538ed5c347b73808c6cda4 100644 (file)
@@ -29,7 +29,9 @@
 #include "util/u_blitter.h"
 #include "tgsi/tgsi_parse.h"
 #include "radeonsi_pipe.h"
+#include "radeonsi_shader.h"
 #include "si_state.h"
+#include "../radeon/r600_cs.h"
 #include "sid.h"
 
 /*
@@ -41,24 +43,28 @@ static void si_pipe_shader_vs(struct pipe_context *ctx, struct si_pipe_shader *s
        struct r600_context *rctx = (struct r600_context *)ctx;
        struct si_pm4_state *pm4;
        unsigned num_sgprs, num_user_sgprs;
-       unsigned nparams, i;
+       unsigned nparams, i, vgpr_comp_cnt;
        uint64_t va;
 
-       if (si_pipe_shader_create(ctx, shader))
-               return;
-
        si_pm4_delete_state(rctx, vs, shader->pm4);
-       pm4 = shader->pm4 = CALLOC_STRUCT(si_pm4_state);
+       pm4 = shader->pm4 = si_pm4_alloc_state(rctx);
 
-       si_pm4_inval_shader_cache(pm4);
+       if (pm4 == NULL)
+               return;
 
        /* Certain attributes (position, psize, etc.) don't count as params.
         * VS is required to export at least one param and r600_shader_from_tgsi()
         * takes care of adding a dummy export.
         */
        for (nparams = 0, i = 0 ; i < shader->shader.noutput; i++) {
-               if (shader->shader.output[i].name != TGSI_SEMANTIC_POSITION)
+               switch (shader->shader.output[i].name) {
+               case TGSI_SEMANTIC_CLIPVERTEX:
+               case TGSI_SEMANTIC_POSITION:
+               case TGSI_SEMANTIC_PSIZE:
+                       break;
+               default:
                        nparams++;
+               }
        }
        if (nparams < 1)
                nparams = 1;
@@ -68,30 +74,52 @@ static void si_pipe_shader_vs(struct pipe_context *ctx, struct si_pipe_shader *s
 
        si_pm4_set_reg(pm4, R_02870C_SPI_SHADER_POS_FORMAT,
                       S_02870C_POS0_EXPORT_FORMAT(V_02870C_SPI_SHADER_4COMP) |
-                      S_02870C_POS1_EXPORT_FORMAT(V_02870C_SPI_SHADER_NONE) |
-                      S_02870C_POS2_EXPORT_FORMAT(V_02870C_SPI_SHADER_NONE) |
-                      S_02870C_POS3_EXPORT_FORMAT(V_02870C_SPI_SHADER_NONE));
+                      S_02870C_POS1_EXPORT_FORMAT(shader->shader.nr_pos_exports > 1 ?
+                                                  V_02870C_SPI_SHADER_4COMP :
+                                                  V_02870C_SPI_SHADER_NONE) |
+                      S_02870C_POS2_EXPORT_FORMAT(shader->shader.nr_pos_exports > 2 ?
+                                                  V_02870C_SPI_SHADER_4COMP :
+                                                  V_02870C_SPI_SHADER_NONE) |
+                      S_02870C_POS3_EXPORT_FORMAT(shader->shader.nr_pos_exports > 3 ?
+                                                  V_02870C_SPI_SHADER_4COMP :
+                                                  V_02870C_SPI_SHADER_NONE));
 
        va = r600_resource_va(ctx->screen, (void *)shader->bo);
        si_pm4_add_bo(pm4, shader->bo, RADEON_USAGE_READ);
        si_pm4_set_reg(pm4, R_00B120_SPI_SHADER_PGM_LO_VS, va >> 8);
        si_pm4_set_reg(pm4, R_00B124_SPI_SHADER_PGM_HI_VS, va >> 40);
 
-       num_user_sgprs = 8;
+       num_user_sgprs = SI_VS_NUM_USER_SGPR;
        num_sgprs = shader->num_sgprs;
-       if (num_user_sgprs > num_sgprs)
-               num_sgprs = num_user_sgprs;
-       /* Last 2 reserved SGPRs are used for VCC */
-       num_sgprs += 2;
+       if (num_user_sgprs > num_sgprs) {
+               /* Last 2 reserved SGPRs are used for VCC */
+               num_sgprs = num_user_sgprs + 2;
+       }
        assert(num_sgprs <= 104);
 
+       vgpr_comp_cnt = shader->shader.uses_instanceid ? 3 : 0;
+
        si_pm4_set_reg(pm4, R_00B128_SPI_SHADER_PGM_RSRC1_VS,
                       S_00B128_VGPRS((shader->num_vgprs - 1) / 4) |
-                      S_00B128_SGPRS((num_sgprs - 1) / 8));
+                      S_00B128_SGPRS((num_sgprs - 1) / 8) |
+                      S_00B128_VGPR_COMP_CNT(vgpr_comp_cnt));
        si_pm4_set_reg(pm4, R_00B12C_SPI_SHADER_PGM_RSRC2_VS,
-                      S_00B12C_USER_SGPR(num_user_sgprs));
+                      S_00B12C_USER_SGPR(num_user_sgprs) |
+                      S_00B12C_SO_BASE0_EN(!!shader->selector->so.stride[0]) |
+                      S_00B12C_SO_BASE1_EN(!!shader->selector->so.stride[1]) |
+                      S_00B12C_SO_BASE2_EN(!!shader->selector->so.stride[2]) |
+                      S_00B12C_SO_BASE3_EN(!!shader->selector->so.stride[3]) |
+                      S_00B12C_SO_EN(!!shader->selector->so.num_outputs));
+
+       if (rctx->b.chip_class >= CIK) {
+               si_pm4_set_reg(pm4, R_00B118_SPI_SHADER_PGM_RSRC3_VS,
+                              S_00B118_CU_EN(0xffff));
+               si_pm4_set_reg(pm4, R_00B11C_SPI_SHADER_LATE_ALLOC_VS,
+                              S_00B11C_LIMIT(0));
+       }
 
        si_pm4_bind_state(rctx, vs, shader->pm4);
+       rctx->b.flags |= R600_CONTEXT_INV_SHADER_CACHE;
 }
 
 static void si_pipe_shader_ps(struct pipe_context *ctx, struct si_pipe_shader *shader)
@@ -100,42 +128,44 @@ static void si_pipe_shader_ps(struct pipe_context *ctx, struct si_pipe_shader *s
        struct si_pm4_state *pm4;
        unsigned i, exports_ps, num_cout, spi_ps_in_control, db_shader_control;
        unsigned num_sgprs, num_user_sgprs;
-       int ninterp = 0;
-       boolean have_linear = FALSE, have_centroid = FALSE, have_perspective = FALSE;
-       unsigned spi_baryc_cntl;
+       unsigned spi_baryc_cntl = 0, spi_ps_input_ena, spi_shader_z_format;
        uint64_t va;
 
-       if (si_pipe_shader_create(ctx, shader))
-               return;
-
        si_pm4_delete_state(rctx, ps, shader->pm4);
-       pm4 = shader->pm4 = CALLOC_STRUCT(si_pm4_state);
+       pm4 = shader->pm4 = si_pm4_alloc_state(rctx);
+
+       if (pm4 == NULL)
+               return;
 
-       si_pm4_inval_shader_cache(pm4);
+       db_shader_control = S_02880C_Z_ORDER(V_02880C_EARLY_Z_THEN_LATE_Z) |
+                           S_02880C_ALPHA_TO_MASK_DISABLE(rctx->fb_cb0_is_integer);
 
-       db_shader_control = S_02880C_Z_ORDER(V_02880C_EARLY_Z_THEN_LATE_Z);
        for (i = 0; i < shader->shader.ninput; i++) {
-               ninterp++;
-               /* XXX: Flat shading hangs the GPU */
-               if (shader->shader.input[i].interpolate == TGSI_INTERPOLATE_CONSTANT ||
-                   (shader->shader.input[i].interpolate == TGSI_INTERPOLATE_COLOR &&
-                    rctx->queued.named.rasterizer->flatshade))
-                       have_linear = TRUE;
-               if (shader->shader.input[i].interpolate == TGSI_INTERPOLATE_LINEAR)
-                       have_linear = TRUE;
-               if (shader->shader.input[i].interpolate == TGSI_INTERPOLATE_PERSPECTIVE)
-                       have_perspective = TRUE;
-               if (shader->shader.input[i].centroid)
-                       have_centroid = TRUE;
+               switch (shader->shader.input[i].name) {
+               case TGSI_SEMANTIC_POSITION:
+                       if (shader->shader.input[i].centroid) {
+                               /* SPI_BARYC_CNTL.POS_FLOAT_LOCATION
+                                * Possible vaules:
+                                * 0 -> Position = pixel center (default)
+                                * 1 -> Position = pixel centroid
+                                * 2 -> Position = iterated sample number XXX:
+                                *                        What does this mean?
+                                */
+                               spi_baryc_cntl |= S_0286E0_POS_FLOAT_LOCATION(1);
+                       }
+                       /* Fall through */
+               case TGSI_SEMANTIC_FACE:
+                       continue;
+               }
        }
 
        for (i = 0; i < shader->shader.noutput; i++) {
                if (shader->shader.output[i].name == TGSI_SEMANTIC_POSITION)
                        db_shader_control |= S_02880C_Z_EXPORT_ENABLE(1);
                if (shader->shader.output[i].name == TGSI_SEMANTIC_STENCIL)
-                       db_shader_control |= 0; // XXX OP_VAL or TEST_VAL?
+                       db_shader_control |= S_02880C_STENCIL_TEST_VAL_EXPORT_ENABLE(1);
        }
-       if (shader->shader.uses_kill)
+       if (shader->shader.uses_kill || shader->key.ps.alpha_func != PIPE_FUNC_ALWAYS)
                db_shader_control |= S_02880C_KILL_ENABLE(1);
 
        exports_ps = 0;
@@ -156,51 +186,67 @@ static void si_pipe_shader_ps(struct pipe_context *ctx, struct si_pipe_shader *s
                exports_ps = 2;
        }
 
-       spi_ps_in_control = S_0286D8_NUM_INTERP(ninterp);
-
-       spi_baryc_cntl = 0;
-       if (have_perspective)
-               spi_baryc_cntl |= have_centroid ?
-                       S_0286E0_PERSP_CENTROID_CNTL(1) : S_0286E0_PERSP_CENTER_CNTL(1);
-       if (have_linear)
-               spi_baryc_cntl |= have_centroid ?
-                       S_0286E0_LINEAR_CENTROID_CNTL(1) : S_0286E0_LINEAR_CENTER_CNTL(1);
+       spi_ps_in_control = S_0286D8_NUM_INTERP(shader->shader.ninterp) |
+               S_0286D8_BC_OPTIMIZE_DISABLE(1);
 
        si_pm4_set_reg(pm4, R_0286E0_SPI_BARYC_CNTL, spi_baryc_cntl);
-       si_pm4_set_reg(pm4, R_0286CC_SPI_PS_INPUT_ENA, shader->spi_ps_input_ena);
-       si_pm4_set_reg(pm4, R_0286D0_SPI_PS_INPUT_ADDR, shader->spi_ps_input_ena);
+       spi_ps_input_ena = shader->spi_ps_input_ena;
+       /* we need to enable at least one of them, otherwise we hang the GPU */
+       assert(G_0286CC_PERSP_SAMPLE_ENA(spi_ps_input_ena) ||
+           G_0286CC_PERSP_CENTER_ENA(spi_ps_input_ena) ||
+           G_0286CC_PERSP_CENTROID_ENA(spi_ps_input_ena) ||
+           G_0286CC_PERSP_PULL_MODEL_ENA(spi_ps_input_ena) ||
+           G_0286CC_LINEAR_SAMPLE_ENA(spi_ps_input_ena) ||
+           G_0286CC_LINEAR_CENTER_ENA(spi_ps_input_ena) ||
+           G_0286CC_LINEAR_CENTROID_ENA(spi_ps_input_ena) ||
+           G_0286CC_LINE_STIPPLE_TEX_ENA(spi_ps_input_ena));
+
+       si_pm4_set_reg(pm4, R_0286CC_SPI_PS_INPUT_ENA, spi_ps_input_ena);
+       si_pm4_set_reg(pm4, R_0286D0_SPI_PS_INPUT_ADDR, spi_ps_input_ena);
        si_pm4_set_reg(pm4, R_0286D8_SPI_PS_IN_CONTROL, spi_ps_in_control);
 
-       /* XXX: Depends on Z buffer format? */
-       si_pm4_set_reg(pm4, R_028710_SPI_SHADER_Z_FORMAT, 0);
-
-       /* XXX: Depends on color buffer format? */
+       if (G_02880C_STENCIL_TEST_VAL_EXPORT_ENABLE(db_shader_control))
+               spi_shader_z_format = V_028710_SPI_SHADER_32_GR;
+       else if (G_02880C_Z_EXPORT_ENABLE(db_shader_control))
+               spi_shader_z_format = V_028710_SPI_SHADER_32_R;
+       else
+               spi_shader_z_format = 0;
+       si_pm4_set_reg(pm4, R_028710_SPI_SHADER_Z_FORMAT, spi_shader_z_format);
        si_pm4_set_reg(pm4, R_028714_SPI_SHADER_COL_FORMAT,
-                      S_028714_COL0_EXPORT_FORMAT(V_028714_SPI_SHADER_32_ABGR));
+                      shader->spi_shader_col_format);
+       si_pm4_set_reg(pm4, R_02823C_CB_SHADER_MASK, shader->cb_shader_mask);
 
        va = r600_resource_va(ctx->screen, (void *)shader->bo);
        si_pm4_add_bo(pm4, shader->bo, RADEON_USAGE_READ);
        si_pm4_set_reg(pm4, R_00B020_SPI_SHADER_PGM_LO_PS, va >> 8);
        si_pm4_set_reg(pm4, R_00B024_SPI_SHADER_PGM_HI_PS, va >> 40);
 
-       num_user_sgprs = 6;
+       num_user_sgprs = SI_PS_NUM_USER_SGPR;
        num_sgprs = shader->num_sgprs;
-       if (num_user_sgprs > num_sgprs)
-               num_sgprs = num_user_sgprs;
-       /* Last 2 reserved SGPRs are used for VCC */
-       num_sgprs += 2;
+       /* One SGPR after user SGPRs is pre-loaded with {prim_mask, lds_offset} */
+       if ((num_user_sgprs + 1) > num_sgprs) {
+               /* Last 2 reserved SGPRs are used for VCC */
+               num_sgprs = num_user_sgprs + 1 + 2;
+       }
        assert(num_sgprs <= 104);
 
        si_pm4_set_reg(pm4, R_00B028_SPI_SHADER_PGM_RSRC1_PS,
                       S_00B028_VGPRS((shader->num_vgprs - 1) / 4) |
                       S_00B028_SGPRS((num_sgprs - 1) / 8));
        si_pm4_set_reg(pm4, R_00B02C_SPI_SHADER_PGM_RSRC2_PS,
+                      S_00B02C_EXTRA_LDS_SIZE(shader->lds_size) |
                       S_00B02C_USER_SGPR(num_user_sgprs));
+       if (rctx->b.chip_class >= CIK) {
+               si_pm4_set_reg(pm4, R_00B01C_SPI_SHADER_PGM_RSRC3_PS,
+                              S_00B01C_CU_EN(0xffff));
+       }
 
        si_pm4_set_reg(pm4, R_02880C_DB_SHADER_CONTROL, db_shader_control);
 
+       shader->cb0_is_integer = rctx->fb_cb0_is_integer;
        shader->sprite_coord_enable = rctx->sprite_coord_enable;
        si_pm4_bind_state(rctx, ps, shader->pm4);
+       rctx->b.flags |= R600_CONTEXT_INV_SHADER_CACHE;
 }
 
 /*
@@ -232,11 +278,37 @@ static unsigned si_conv_pipe_prim(unsigned pprim)
        return result;
 }
 
+static unsigned r600_conv_prim_to_gs_out(unsigned mode)
+{
+       static const int prim_conv[] = {
+               [PIPE_PRIM_POINTS]                      = V_028A6C_OUTPRIM_TYPE_POINTLIST,
+               [PIPE_PRIM_LINES]                       = V_028A6C_OUTPRIM_TYPE_LINESTRIP,
+               [PIPE_PRIM_LINE_LOOP]                   = V_028A6C_OUTPRIM_TYPE_LINESTRIP,
+               [PIPE_PRIM_LINE_STRIP]                  = V_028A6C_OUTPRIM_TYPE_LINESTRIP,
+               [PIPE_PRIM_TRIANGLES]                   = V_028A6C_OUTPRIM_TYPE_TRISTRIP,
+               [PIPE_PRIM_TRIANGLE_STRIP]              = V_028A6C_OUTPRIM_TYPE_TRISTRIP,
+               [PIPE_PRIM_TRIANGLE_FAN]                = V_028A6C_OUTPRIM_TYPE_TRISTRIP,
+               [PIPE_PRIM_QUADS]                       = V_028A6C_OUTPRIM_TYPE_TRISTRIP,
+               [PIPE_PRIM_QUAD_STRIP]                  = V_028A6C_OUTPRIM_TYPE_TRISTRIP,
+               [PIPE_PRIM_POLYGON]                     = V_028A6C_OUTPRIM_TYPE_TRISTRIP,
+               [PIPE_PRIM_LINES_ADJACENCY]             = V_028A6C_OUTPRIM_TYPE_LINESTRIP,
+               [PIPE_PRIM_LINE_STRIP_ADJACENCY]        = V_028A6C_OUTPRIM_TYPE_LINESTRIP,
+               [PIPE_PRIM_TRIANGLES_ADJACENCY]         = V_028A6C_OUTPRIM_TYPE_TRISTRIP,
+               [PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY]    = V_028A6C_OUTPRIM_TYPE_TRISTRIP
+       };
+       assert(mode < Elements(prim_conv));
+
+       return prim_conv[mode];
+}
+
 static bool si_update_draw_info_state(struct r600_context *rctx,
-                              const struct pipe_draw_info *info)
+                                     const struct pipe_draw_info *info,
+                                     const struct pipe_index_buffer *ib)
 {
-       struct si_pm4_state *pm4 = CALLOC_STRUCT(si_pm4_state);
+       struct si_pm4_state *pm4 = si_pm4_alloc_state(rctx);
+       struct si_shader *vs = &rctx->vs_shader->current->shader;
        unsigned prim = si_conv_pipe_prim(info->mode);
+       unsigned gs_out_prim = r600_conv_prim_to_gs_out(info->mode);
        unsigned ls_mask = 0;
 
        if (pm4 == NULL)
@@ -247,16 +319,39 @@ static bool si_update_draw_info_state(struct r600_context *rctx,
                return false;
        }
 
-       si_pm4_set_reg(pm4, R_008958_VGT_PRIMITIVE_TYPE, prim);
+       if (rctx->b.chip_class >= CIK) {
+               struct si_state_rasterizer *rs = rctx->queued.named.rasterizer;
+               bool wd_switch_on_eop = prim == V_008958_DI_PT_POLYGON ||
+                                       prim == V_008958_DI_PT_LINELOOP ||
+                                       prim == V_008958_DI_PT_TRIFAN ||
+                                       prim == V_008958_DI_PT_TRISTRIP_ADJ ||
+                                       info->primitive_restart ||
+                                       (rs ? rs->line_stipple_enable : false);
+               /* If the WD switch is false, the IA switch must be false too. */
+               bool ia_switch_on_eop = wd_switch_on_eop;
+
+               si_pm4_set_reg(pm4, R_028AA8_IA_MULTI_VGT_PARAM,
+                              S_028AA8_SWITCH_ON_EOP(ia_switch_on_eop) |
+                              S_028AA8_PARTIAL_VS_WAVE_ON(1) |
+                              S_028AA8_PRIMGROUP_SIZE(63) |
+                              S_028AA8_WD_SWITCH_ON_EOP(wd_switch_on_eop));
+               si_pm4_set_reg(pm4, R_028B74_VGT_DISPATCH_DRAW_INDEX,
+                              ib->index_size == 4 ? 0xFC000000 : 0xFC00);
+
+               si_pm4_set_reg(pm4, R_030908_VGT_PRIMITIVE_TYPE, prim);
+       } else {
+               si_pm4_set_reg(pm4, R_008958_VGT_PRIMITIVE_TYPE, prim);
+       }
+
+       si_pm4_set_reg(pm4, R_028A6C_VGT_GS_OUT_PRIM_TYPE, gs_out_prim);
        si_pm4_set_reg(pm4, R_028400_VGT_MAX_VTX_INDX, ~0);
        si_pm4_set_reg(pm4, R_028404_VGT_MIN_VTX_INDX, 0);
-       si_pm4_set_reg(pm4, R_028408_VGT_INDX_OFFSET, info->index_bias);
+       si_pm4_set_reg(pm4, R_028408_VGT_INDX_OFFSET,
+                      info->indexed ? info->index_bias : info->start);
        si_pm4_set_reg(pm4, R_02840C_VGT_MULTI_PRIM_IB_RESET_INDX, info->restart_index);
        si_pm4_set_reg(pm4, R_028A94_VGT_MULTI_PRIM_IB_RESET_EN, info->primitive_restart);
-#if 0
-       si_pm4_set_reg(pm4, R_03CFF0_SQ_VTX_BASE_VTX_LOC, 0);
-       si_pm4_set_reg(pm4, R_03CFF4_SQ_VTX_START_INST_LOC, info->start_instance);
-#endif
+       si_pm4_set_reg(pm4, R_00B130_SPI_SHADER_USER_DATA_VS_0 + SI_SGPR_START_INSTANCE * 4,
+                      info->start_instance);
 
         if (prim == V_008958_DI_PT_LINELIST)
                 ls_mask = 1;
@@ -273,62 +368,52 @@ static bool si_update_draw_info_state(struct r600_context *rctx,
                si_pm4_set_reg(pm4, R_028814_PA_SU_SC_MODE_CNTL, rctx->pa_su_sc_mode_cntl);
         }
        si_pm4_set_reg(pm4, R_02881C_PA_CL_VS_OUT_CNTL,
-                      prim == PIPE_PRIM_POINTS ? rctx->pa_cl_vs_out_cntl : 0
-                      /*| (rctx->rasterizer->clip_plane_enable &
-                      rctx->vs_shader->shader.clip_dist_write)*/);
-       si_pm4_set_reg(pm4, R_028810_PA_CL_CLIP_CNTL, rctx->pa_cl_clip_cntl
-                       /*| (rctx->vs_shader->shader.clip_dist_write ||
-                       rctx->vs_shader->shader.vs_prohibit_ucps ?
-                       0 : rctx->rasterizer->clip_plane_enable & 0x3F)*/);
+                      S_02881C_USE_VTX_POINT_SIZE(vs->vs_out_point_size) |
+                      S_02881C_VS_OUT_CCDIST0_VEC_ENA((vs->clip_dist_write & 0x0F) != 0) |
+                      S_02881C_VS_OUT_CCDIST1_VEC_ENA((vs->clip_dist_write & 0xF0) != 0) |
+                      S_02881C_VS_OUT_MISC_VEC_ENA(vs->vs_out_misc_write) |
+                      (rctx->queued.named.rasterizer->clip_plane_enable &
+                       vs->clip_dist_write));
+       si_pm4_set_reg(pm4, R_028810_PA_CL_CLIP_CNTL,
+                      rctx->queued.named.rasterizer->pa_cl_clip_cntl |
+                      (vs->clip_dist_write ? 0 :
+                       rctx->queued.named.rasterizer->clip_plane_enable & 0x3F));
 
        si_pm4_set_state(rctx, draw_info, pm4);
        return true;
 }
 
-static void si_update_alpha_ref(struct r600_context *rctx)
-{
-#if 0
-        unsigned alpha_ref;
-        struct r600_pipe_state rstate;
-
-        alpha_ref = rctx->alpha_ref;
-        rstate.nregs = 0;
-        if (rctx->export_16bpc)
-                alpha_ref &= ~0x1FFF;
-        si_pm4_set_reg(&rstate, R_028438_SX_ALPHA_REF, alpha_ref);
-
-       si_pm4_set_state(rctx, TODO, pm4);
-        rctx->alpha_ref_dirty = false;
-#endif
-}
-
 static void si_update_spi_map(struct r600_context *rctx)
 {
-       struct si_shader *ps = &rctx->ps_shader->shader;
-       struct si_shader *vs = &rctx->vs_shader->shader;
-       struct si_pm4_state *pm4 = CALLOC_STRUCT(si_pm4_state);
+       struct si_shader *ps = &rctx->ps_shader->current->shader;
+       struct si_shader *vs = &rctx->vs_shader->current->shader;
+       struct si_pm4_state *pm4 = si_pm4_alloc_state(rctx);
        unsigned i, j, tmp;
 
        for (i = 0; i < ps->ninput; i++) {
+               unsigned name = ps->input[i].name;
+               unsigned param_offset = ps->input[i].param_offset;
+
+               if (name == TGSI_SEMANTIC_POSITION)
+                       /* Read from preloaded VGPRs, not parameters */
+                       continue;
+
+bcolor:
                tmp = 0;
 
-#if 0
-               /* XXX: Flat shading hangs the GPU */
-               if (ps->input[i].name == TGSI_SEMANTIC_POSITION ||
-                   ps->input[i].interpolate == TGSI_INTERPOLATE_CONSTANT ||
+               if (ps->input[i].interpolate == TGSI_INTERPOLATE_CONSTANT ||
                    (ps->input[i].interpolate == TGSI_INTERPOLATE_COLOR &&
-                    rctx->rasterizer && rctx->rasterizer->flatshade)) {
+                    rctx->ps_shader->current->key.ps.flatshade)) {
                        tmp |= S_028644_FLAT_SHADE(1);
                }
-#endif
 
-               if (ps->input[i].name == TGSI_SEMANTIC_GENERIC &&
+               if (name == TGSI_SEMANTIC_GENERIC &&
                    rctx->sprite_coord_enable & (1 << ps->input[i].sid)) {
                        tmp |= S_028644_PT_SPRITE_TEX(1);
                }
 
                for (j = 0; j < vs->noutput; j++) {
-                       if (ps->input[i].name == vs->output[j].name &&
+                       if (name == vs->output[j].name &&
                            ps->input[i].sid == vs->output[j].sid) {
                                tmp |= S_028644_OFFSET(vs->output[j].param_offset);
                                break;
@@ -340,7 +425,16 @@ static void si_update_spi_map(struct r600_context *rctx)
                        tmp |= S_028644_OFFSET(0x20);
                }
 
-               si_pm4_set_reg(pm4, R_028644_SPI_PS_INPUT_CNTL_0 + i * 4, tmp);
+               si_pm4_set_reg(pm4,
+                              R_028644_SPI_PS_INPUT_CNTL_0 + param_offset * 4,
+                              tmp);
+
+               if (name == TGSI_SEMANTIC_COLOR &&
+                   rctx->ps_shader->current->key.ps.color_two_side) {
+                       name = TGSI_SEMANTIC_BCOLOR;
+                       param_offset++;
+                       goto bcolor;
+               }
        }
 
        si_pm4_set_state(rctx, spi, pm4);
@@ -349,141 +443,291 @@ static void si_update_spi_map(struct r600_context *rctx)
 static void si_update_derived_state(struct r600_context *rctx)
 {
        struct pipe_context * ctx = (struct pipe_context*)rctx;
+       unsigned vs_dirty = 0, ps_dirty = 0;
 
        if (!rctx->blitter->running) {
-               if (rctx->have_depth_fb || rctx->have_depth_texture)
-                       r600_flush_depth_textures(rctx);
+               /* Flush depth textures which need to be flushed. */
+               for (int i = 0; i < SI_NUM_SHADERS; i++) {
+                       if (rctx->samplers[i].depth_texture_mask) {
+                               si_flush_depth_textures(rctx, &rctx->samplers[i]);
+                       }
+                       if (rctx->samplers[i].compressed_colortex_mask) {
+                               r600_decompress_color_textures(rctx, &rctx->samplers[i]);
+                       }
+               }
+       }
+
+       si_shader_select(ctx, rctx->vs_shader, &vs_dirty);
+
+       if (!rctx->vs_shader->current->pm4) {
+               si_pipe_shader_vs(ctx, rctx->vs_shader->current);
+               vs_dirty = 0;
        }
 
-       if ((rctx->ps_shader->shader.fs_write_all &&
-            (rctx->ps_shader->shader.nr_cbufs != rctx->framebuffer.nr_cbufs)) ||
-           (rctx->sprite_coord_enable &&
-            (rctx->ps_shader->sprite_coord_enable != rctx->sprite_coord_enable))) {
-               si_pipe_shader_destroy(&rctx->context, rctx->ps_shader);
+       if (vs_dirty) {
+               si_pm4_bind_state(rctx, vs, rctx->vs_shader->current->pm4);
        }
 
-       if (rctx->alpha_ref_dirty) {
-               si_update_alpha_ref(rctx);
+
+       si_shader_select(ctx, rctx->ps_shader, &ps_dirty);
+
+       if (!rctx->ps_shader->current->pm4) {
+               si_pipe_shader_ps(ctx, rctx->ps_shader->current);
+               ps_dirty = 0;
        }
+       if (!rctx->ps_shader->current->bo) {
+               if (!rctx->dummy_pixel_shader->pm4)
+                       si_pipe_shader_ps(ctx, rctx->dummy_pixel_shader);
+               else
+                       si_pm4_bind_state(rctx, vs, rctx->dummy_pixel_shader->pm4);
 
-       if (!rctx->vs_shader->bo) {
-               si_pipe_shader_vs(ctx, rctx->vs_shader);
+               ps_dirty = 0;
+       }
+       if (rctx->ps_shader->current->cb0_is_integer != rctx->fb_cb0_is_integer) {
+               si_pipe_shader_ps(ctx, rctx->ps_shader->current);
+               ps_dirty = 1;
        }
 
-       if (!rctx->ps_shader->bo) {
-               si_pipe_shader_ps(ctx, rctx->ps_shader);
+       if (ps_dirty) {
+               si_pm4_bind_state(rctx, ps, rctx->ps_shader->current->pm4);
        }
 
-       if (rctx->shader_dirty) {
+       if (si_pm4_state_changed(rctx, ps) || si_pm4_state_changed(rctx, vs)) {
+               /* XXX: Emitting the PS state even when only the VS changed
+                * fixes random failures with piglit glsl-max-varyings.
+                * Not sure why...
+                */
+               rctx->emitted.named.ps = NULL;
                si_update_spi_map(rctx);
-               rctx->shader_dirty = false;
        }
 }
 
 static void si_vertex_buffer_update(struct r600_context *rctx)
 {
-       struct pipe_context *ctx = &rctx->context;
-       struct si_resource *rbuffer, *t_list_buffer;
-       struct pipe_vertex_buffer *vertex_buffer;
-       struct si_pm4_state *pm4 = CALLOC_STRUCT(si_pm4_state);
-       unsigned i, count, offset;
-       uint32_t *ptr;
+       struct pipe_context *ctx = &rctx->b.b;
+       struct si_pm4_state *pm4 = si_pm4_alloc_state(rctx);
+       bool bound[PIPE_MAX_ATTRIBS] = {};
+       unsigned i, count;
        uint64_t va;
 
-       si_pm4_inval_vertex_cache(pm4);
+       rctx->b.flags |= R600_CONTEXT_INV_TEX_CACHE;
 
-       /* bind vertex buffer once */
-       count = rctx->nr_vertex_buffers;
+       count = rctx->vertex_elements->count;
        assert(count <= 256 / 4);
 
-       t_list_buffer = si_resource_create_custom(ctx->screen, PIPE_USAGE_IMMUTABLE,
-                                                 4 * 4 * count);
-       if (t_list_buffer == NULL) {
-               FREE(pm4);
-               return;
-       }
+       si_pm4_sh_data_begin(pm4);
+       for (i = 0 ; i < count; i++) {
+               struct pipe_vertex_element *ve = &rctx->vertex_elements->elements[i];
+               struct pipe_vertex_buffer *vb;
+               struct r600_resource *rbuffer;
+               unsigned offset;
 
-       ptr = (uint32_t*)rctx->ws->buffer_map(t_list_buffer->cs_buf,
-                                             rctx->cs,
-                                             PIPE_TRANSFER_WRITE);
+               if (ve->vertex_buffer_index >= rctx->nr_vertex_buffers)
+                       continue;
 
-       for (i = 0 ; i < count; i++, ptr += 4) {
-               struct pipe_vertex_element *velem = &rctx->vertex_elements->elements[i];
-               const struct util_format_description *desc;
-               unsigned data_format, num_format;
-               int first_non_void;
+               vb = &rctx->vertex_buffer[ve->vertex_buffer_index];
+               rbuffer = (struct r600_resource*)vb->buffer;
+               if (rbuffer == NULL)
+                       continue;
 
-               /* bind vertex buffer once */
-               vertex_buffer = &rctx->vertex_buffer[i];
-               rbuffer = (struct si_resource*)vertex_buffer->buffer;
                offset = 0;
-               if (vertex_buffer == NULL || rbuffer == NULL)
-                       continue;
-               offset += vertex_buffer->buffer_offset;
+               offset += vb->buffer_offset;
+               offset += ve->src_offset;
 
                va = r600_resource_va(ctx->screen, (void*)rbuffer);
                va += offset;
 
-               desc = util_format_description(velem->src_format);
-               first_non_void = util_format_get_first_non_void_channel(velem->src_format);
-               data_format = si_translate_vertexformat(ctx->screen,
-                                                       velem->src_format,
-                                                       desc, first_non_void);
+               /* Fill in T# buffer resource description */
+               si_pm4_sh_data_add(pm4, va & 0xFFFFFFFF);
+               si_pm4_sh_data_add(pm4, (S_008F04_BASE_ADDRESS_HI(va >> 32) |
+                                        S_008F04_STRIDE(vb->stride)));
+               if (vb->stride)
+                       /* Round up by rounding down and adding 1 */
+                       si_pm4_sh_data_add(pm4,
+                                          (vb->buffer->width0 - offset -
+                                           util_format_get_blocksize(ve->src_format)) /
+                                          vb->stride + 1);
+               else
+                       si_pm4_sh_data_add(pm4, vb->buffer->width0 - offset);
+               si_pm4_sh_data_add(pm4, rctx->vertex_elements->rsrc_word3[i]);
 
-               switch (desc->channel[first_non_void].type) {
-               case UTIL_FORMAT_TYPE_FIXED:
-                       num_format = V_008F0C_BUF_NUM_FORMAT_USCALED; /* XXX */
-                       break;
-               case UTIL_FORMAT_TYPE_SIGNED:
-                       num_format = V_008F0C_BUF_NUM_FORMAT_SNORM;
-                       break;
-               case UTIL_FORMAT_TYPE_UNSIGNED:
-                       num_format = V_008F0C_BUF_NUM_FORMAT_UNORM;
-                       break;
-               case UTIL_FORMAT_TYPE_FLOAT:
-               default:
-                       num_format = V_008F14_IMG_NUM_FORMAT_FLOAT;
+               if (!bound[ve->vertex_buffer_index]) {
+                       si_pm4_add_bo(pm4, rbuffer, RADEON_USAGE_READ);
+                       bound[ve->vertex_buffer_index] = true;
                }
+       }
+       si_pm4_sh_data_end(pm4, R_00B130_SPI_SHADER_USER_DATA_VS_0, SI_SGPR_VERTEX_BUFFER);
+       si_pm4_set_state(rctx, vertex_buffers, pm4);
+}
 
-               /* Fill in T# buffer resource description */
-               ptr[0] = va & 0xFFFFFFFF;
-               ptr[1] = (S_008F04_BASE_ADDRESS_HI(va >> 32) |
-                         S_008F04_STRIDE(vertex_buffer->stride));
-               if (vertex_buffer->stride > 0)
-                       ptr[2] = ((vertex_buffer->buffer->width0 - offset) /
-                                 vertex_buffer->stride);
-               else
-                       ptr[2] = vertex_buffer->buffer->width0 - offset;
-               ptr[3] = (S_008F0C_DST_SEL_X(si_map_swizzle(desc->swizzle[0])) |
-                         S_008F0C_DST_SEL_Y(si_map_swizzle(desc->swizzle[1])) |
-                         S_008F0C_DST_SEL_Z(si_map_swizzle(desc->swizzle[2])) |
-                         S_008F0C_DST_SEL_W(si_map_swizzle(desc->swizzle[3])) |
-                         S_008F0C_NUM_FORMAT(num_format) |
-                         S_008F0C_DATA_FORMAT(data_format));
+static void si_state_draw(struct r600_context *rctx,
+                         const struct pipe_draw_info *info,
+                         const struct pipe_index_buffer *ib)
+{
+       struct si_pm4_state *pm4 = si_pm4_alloc_state(rctx);
+
+       if (pm4 == NULL)
+               return;
+
+       /* queries need some special values
+        * (this is non-zero if any query is active) */
+       if (rctx->num_cs_dw_nontimer_queries_suspend) {
+               struct si_state_dsa *dsa = rctx->queued.named.dsa;
+
+               if (rctx->b.chip_class >= CIK) {
+                       si_pm4_set_reg(pm4, R_028004_DB_COUNT_CONTROL,
+                                      S_028004_PERFECT_ZPASS_COUNTS(1) |
+                                      S_028004_SAMPLE_RATE(rctx->fb_log_samples) |
+                                      S_028004_ZPASS_ENABLE(1) |
+                                      S_028004_SLICE_EVEN_ENABLE(1) |
+                                      S_028004_SLICE_ODD_ENABLE(1));
+               } else {
+                       si_pm4_set_reg(pm4, R_028004_DB_COUNT_CONTROL,
+                                      S_028004_PERFECT_ZPASS_COUNTS(1) |
+                                      S_028004_SAMPLE_RATE(rctx->fb_log_samples));
+               }
+               si_pm4_set_reg(pm4, R_02800C_DB_RENDER_OVERRIDE,
+                              dsa->db_render_override |
+                              S_02800C_NOOP_CULL_DISABLE(1));
+       }
 
-               si_pm4_add_bo(pm4, rbuffer, RADEON_USAGE_READ);
+       if (info->count_from_stream_output) {
+               struct r600_so_target *t =
+                       (struct r600_so_target*)info->count_from_stream_output;
+               uint64_t va = r600_resource_va(&rctx->screen->b.b,
+                                              &t->buf_filled_size->b.b);
+               va += t->buf_filled_size_offset;
+
+               si_pm4_set_reg(pm4, R_028B30_VGT_STRMOUT_DRAW_OPAQUE_VERTEX_STRIDE,
+                              t->stride_in_dw);
+
+               si_pm4_cmd_begin(pm4, PKT3_COPY_DATA);
+               si_pm4_cmd_add(pm4,
+                              COPY_DATA_SRC_SEL(COPY_DATA_MEM) |
+                              COPY_DATA_DST_SEL(COPY_DATA_REG) |
+                              COPY_DATA_WR_CONFIRM);
+               si_pm4_cmd_add(pm4, va);     /* src address lo */
+               si_pm4_cmd_add(pm4, va >> 32UL); /* src address hi */
+               si_pm4_cmd_add(pm4, R_028B2C_VGT_STRMOUT_DRAW_OPAQUE_BUFFER_FILLED_SIZE >> 2);
+               si_pm4_cmd_add(pm4, 0); /* unused */
+               si_pm4_add_bo(pm4, t->buf_filled_size, RADEON_USAGE_READ);
+               si_pm4_cmd_end(pm4, true);
        }
 
-       va = r600_resource_va(ctx->screen, (void*)t_list_buffer);
-       si_pm4_add_bo(pm4, t_list_buffer, RADEON_USAGE_READ);
-       si_pm4_set_reg(pm4, R_00B148_SPI_SHADER_USER_DATA_VS_6, va);
-       si_pm4_set_reg(pm4, R_00B14C_SPI_SHADER_USER_DATA_VS_7, va >> 32);
-       si_pm4_set_state(rctx, vertex_buffers, pm4);
+       /* draw packet */
+       si_pm4_cmd_begin(pm4, PKT3_INDEX_TYPE);
+       if (ib->index_size == 4) {
+               si_pm4_cmd_add(pm4, V_028A7C_VGT_INDEX_32 | (R600_BIG_ENDIAN ?
+                               V_028A7C_VGT_DMA_SWAP_32_BIT : 0));
+       } else {
+               si_pm4_cmd_add(pm4, V_028A7C_VGT_INDEX_16 | (R600_BIG_ENDIAN ?
+                               V_028A7C_VGT_DMA_SWAP_16_BIT : 0));
+       }
+       si_pm4_cmd_end(pm4, rctx->predicate_drawing);
+
+       si_pm4_cmd_begin(pm4, PKT3_NUM_INSTANCES);
+       si_pm4_cmd_add(pm4, info->instance_count);
+       si_pm4_cmd_end(pm4, rctx->predicate_drawing);
+
+       if (info->indexed) {
+               uint32_t max_size = (ib->buffer->width0 - ib->offset) /
+                                rctx->index_buffer.index_size;
+               uint64_t va;
+               va = r600_resource_va(&rctx->screen->b.b, ib->buffer);
+               va += ib->offset;
+
+               si_pm4_add_bo(pm4, (struct r600_resource *)ib->buffer, RADEON_USAGE_READ);
+               si_cmd_draw_index_2(pm4, max_size, va, info->count,
+                                   V_0287F0_DI_SRC_SEL_DMA,
+                                   rctx->predicate_drawing);
+       } else {
+               uint32_t initiator = V_0287F0_DI_SRC_SEL_AUTO_INDEX;
+               initiator |= S_0287F0_USE_OPAQUE(!!info->count_from_stream_output);
+               si_cmd_draw_index_auto(pm4, info->count, initiator, rctx->predicate_drawing);
+       }
+       si_pm4_set_state(rctx, draw, pm4);
+}
+
+void si_emit_cache_flush(struct r600_common_context *rctx, struct r600_atom *atom)
+{
+       struct radeon_winsys_cs *cs = rctx->rings.gfx.cs;
+       uint32_t cp_coher_cntl = 0;
+
+       /* XXX SI flushes both ICACHE and KCACHE if either flag is set.
+        * XXX CIK shouldn't have this issue. Test CIK before separating the flags
+        * XXX to ensure there is no regression. Also find out if there is another
+        * XXX way to flush either ICACHE or KCACHE but not both for SI. */
+       if (rctx->flags & (R600_CONTEXT_INV_SHADER_CACHE |
+                          R600_CONTEXT_INV_CONST_CACHE)) {
+               cp_coher_cntl |= S_0085F0_SH_ICACHE_ACTION_ENA(1) |
+                                S_0085F0_SH_KCACHE_ACTION_ENA(1);
+       }
+       if (rctx->flags & (R600_CONTEXT_INV_TEX_CACHE |
+                          R600_CONTEXT_STREAMOUT_FLUSH)) {
+               cp_coher_cntl |= S_0085F0_TC_ACTION_ENA(1) |
+                                S_0085F0_TCL1_ACTION_ENA(1);
+       }
+       if (rctx->flags & R600_CONTEXT_FLUSH_AND_INV_CB) {
+               cp_coher_cntl |= S_0085F0_CB_ACTION_ENA(1) |
+                                S_0085F0_CB0_DEST_BASE_ENA(1) |
+                                S_0085F0_CB1_DEST_BASE_ENA(1) |
+                                S_0085F0_CB2_DEST_BASE_ENA(1) |
+                                S_0085F0_CB3_DEST_BASE_ENA(1) |
+                                S_0085F0_CB4_DEST_BASE_ENA(1) |
+                                S_0085F0_CB5_DEST_BASE_ENA(1) |
+                                S_0085F0_CB6_DEST_BASE_ENA(1) |
+                                S_0085F0_CB7_DEST_BASE_ENA(1);
+       }
+       if (rctx->flags & R600_CONTEXT_FLUSH_AND_INV_DB) {
+               cp_coher_cntl |= S_0085F0_DB_ACTION_ENA(1) |
+                                S_0085F0_DB_DEST_BASE_ENA(1);
+       }
+
+       if (cp_coher_cntl) {
+               if (rctx->chip_class >= CIK) {
+                       radeon_emit(cs, PKT3(PKT3_ACQUIRE_MEM, 5, 0));
+                       radeon_emit(cs, cp_coher_cntl);   /* CP_COHER_CNTL */
+                       radeon_emit(cs, 0xffffffff);      /* CP_COHER_SIZE */
+                       radeon_emit(cs, 0xff);            /* CP_COHER_SIZE_HI */
+                       radeon_emit(cs, 0);               /* CP_COHER_BASE */
+                       radeon_emit(cs, 0);               /* CP_COHER_BASE_HI */
+                       radeon_emit(cs, 0x0000000A);      /* POLL_INTERVAL */
+               } else {
+                       radeon_emit(cs, PKT3(PKT3_SURFACE_SYNC, 3, 0));
+                       radeon_emit(cs, cp_coher_cntl);   /* CP_COHER_CNTL */
+                       radeon_emit(cs, 0xffffffff);      /* CP_COHER_SIZE */
+                       radeon_emit(cs, 0);               /* CP_COHER_BASE */
+                       radeon_emit(cs, 0x0000000A);      /* POLL_INTERVAL */
+               }
+       }
+
+       if (rctx->flags & R600_CONTEXT_FLUSH_AND_INV_CB_META) {
+               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
+               radeon_emit(cs, EVENT_TYPE(V_028A90_FLUSH_AND_INV_CB_META) | EVENT_INDEX(0));
+       }
+
+       if (rctx->flags & R600_CONTEXT_WAIT_3D_IDLE) {
+               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
+               radeon_emit(cs, EVENT_TYPE(V_028A90_PS_PARTIAL_FLUSH) | EVENT_INDEX(4));
+       } else if (rctx->flags & R600_CONTEXT_STREAMOUT_FLUSH) {
+               /* Needed if streamout buffers are going to be used as a source. */
+               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
+               radeon_emit(cs, EVENT_TYPE(V_028A90_VS_PARTIAL_FLUSH) | EVENT_INDEX(4));
+       }
+
+       rctx->flags = 0;
 }
 
-void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *dinfo)
+const struct r600_atom si_atom_cache_flush = { si_emit_cache_flush, 11 }; /* number of CS dwords */
+
+void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
 {
        struct r600_context *rctx = (struct r600_context *)ctx;
-       struct si_state_dsa *dsa = rctx->queued.named.dsa;
-       struct pipe_draw_info info = *dinfo;
-       struct r600_draw rdraw = {};
        struct pipe_index_buffer ib = {};
-       struct r600_atom *state = NULL, *next_state = NULL;
+       uint32_t i;
 
-       if ((!info.count && (info.indexed || !info.count_from_stream_output)) ||
-           (info.indexed && !rctx->index_buffer.buffer)) {
+       if (!info->count && (info->indexed || !info->count_from_stream_output))
                return;
-       }
 
        if (!rctx->ps_shader || !rctx->vs_shader)
                return;
@@ -491,76 +735,70 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *dinfo)
        si_update_derived_state(rctx);
        si_vertex_buffer_update(rctx);
 
-       rdraw.vgt_num_indices = info.count;
-       rdraw.vgt_num_instances = info.instance_count;
-
-       if (info.indexed) {
+       if (info->indexed) {
                /* Initialize the index buffer struct. */
                pipe_resource_reference(&ib.buffer, rctx->index_buffer.buffer);
+               ib.user_buffer = rctx->index_buffer.user_buffer;
                ib.index_size = rctx->index_buffer.index_size;
-               ib.offset = rctx->index_buffer.offset + info.start * ib.index_size;
+               ib.offset = rctx->index_buffer.offset + info->start * ib.index_size;
 
                /* Translate or upload, if needed. */
-               r600_translate_index_buffer(rctx, &ib, info.count);
-
-               if (ib.user_buffer) {
-                       r600_upload_index_buffer(rctx, &ib, info.count);
-               }
+               r600_translate_index_buffer(rctx, &ib, info->count);
 
-               /* Initialize the r600_draw struct with index buffer info. */
-               if (ib.index_size == 4) {
-                       rdraw.vgt_index_type = V_028A7C_VGT_INDEX_32 |
-                               (R600_BIG_ENDIAN ? V_028A7C_VGT_DMA_SWAP_32_BIT : 0);
-               } else {
-                       rdraw.vgt_index_type = V_028A7C_VGT_INDEX_16 |
-                               (R600_BIG_ENDIAN ? V_028A7C_VGT_DMA_SWAP_16_BIT : 0);
-               }
-               rdraw.indices = (struct si_resource*)ib.buffer;
-               rdraw.indices_bo_offset = ib.offset;
-               rdraw.vgt_draw_initiator = V_0287F0_DI_SRC_SEL_DMA;
-       } else {
-               info.index_bias = info.start;
-               rdraw.vgt_draw_initiator = V_0287F0_DI_SRC_SEL_AUTO_INDEX;
-               if (info.count_from_stream_output) {
-                       rdraw.vgt_draw_initiator |= S_0287F0_USE_OPAQUE(1);
-
-                       r600_context_draw_opaque_count(rctx, (struct r600_so_target*)info.count_from_stream_output);
+               if (ib.user_buffer && !ib.buffer) {
+                       r600_upload_index_buffer(rctx, &ib, info->count);
                }
        }
 
-       rctx->vs_shader_so_strides = rctx->vs_shader->so_strides;
-
-       if (!si_update_draw_info_state(rctx, &info))
+       if (!si_update_draw_info_state(rctx, info, &ib))
                return;
 
-       rdraw.db_render_override = dsa->db_render_override;
-       rdraw.db_render_control = dsa->db_render_control;
+       si_state_draw(rctx, info, &ib);
 
-       /* Emit states. */
        rctx->pm4_dirty_cdwords += si_pm4_dirty_dw(rctx);
 
-       r600_need_cs_space(rctx, 0, TRUE);
+       /* Check flush flags. */
+       if (rctx->b.flags)
+               rctx->atoms.cache_flush->dirty = true;
 
-       LIST_FOR_EACH_ENTRY_SAFE(state, next_state, &rctx->dirty_states, head) {
-               r600_emit_atom(rctx, state);
+       si_need_cs_space(rctx, 0, TRUE);
+
+       /* Emit states. */
+       for (i = 0; i < SI_NUM_ATOMS(rctx); i++) {
+               if (rctx->atoms.array[i]->dirty) {
+                       rctx->atoms.array[i]->emit(&rctx->b, rctx->atoms.array[i]);
+                       rctx->atoms.array[i]->dirty = false;
+               }
        }
+
        si_pm4_emit_dirty(rctx);
        rctx->pm4_dirty_cdwords = 0;
 
-       /* Enable stream out if needed. */
-       if (rctx->streamout_start) {
-               r600_context_streamout_begin(rctx);
-               rctx->streamout_start = FALSE;
+#if R600_TRACE_CS
+       if (rctx->screen->trace_bo) {
+               r600_trace_emit(rctx);
        }
+#endif
 
-       si_context_draw(rctx, &rdraw);
-
-       rctx->flags |= R600_CONTEXT_DST_CACHES_DIRTY | R600_CONTEXT_DRAW_PENDING;
+       /* Set the depth buffer as dirty. */
+       if (rctx->framebuffer.zsbuf) {
+               struct pipe_surface *surf = rctx->framebuffer.zsbuf;
+               struct r600_texture *rtex = (struct r600_texture *)surf->texture;
 
-       if (rctx->framebuffer.zsbuf)
-       {
-               struct pipe_resource *tex = rctx->framebuffer.zsbuf->texture;
-               ((struct r600_resource_texture *)tex)->dirty_db = TRUE;
+               rtex->dirty_level_mask |= 1 << surf->u.tex.level;
+       }
+       if (rctx->fb_compressed_cb_mask) {
+               struct pipe_surface *surf;
+               struct r600_texture *rtex;
+               unsigned mask = rctx->fb_compressed_cb_mask;
+
+               do {
+                       unsigned i = u_bit_scan(&mask);
+                       surf = rctx->framebuffer.cbufs[i];
+                       rtex = (struct r600_texture*)surf->texture;
+
+                       rtex->dirty_level_mask |= 1 << surf->u.tex.level;
+               } while (mask);
        }
 
        pipe_resource_reference(&ib.buffer, NULL);