r600g: fix draw-elements and draw-elements-base-vertex
[mesa.git] / src / gallium / drivers / r600 / r600_state.c
index a7a795f9ab7b91cdb53836806044e14c797bcf30..424f7a8913f805ef02c00285254fd15fe4b11deb 100644 (file)
 #include "r600_screen.h"
 #include "r600_context.h"
 #include "r600_resource.h"
-#include "r600d.h"
-#include "r600_state_inlines.h"
-
-static void r600_blend(struct r600_context *rctx, struct radeon_state *rstate, const struct pipe_blend_state *state);
-static void r600_viewport(struct r600_context *rctx, struct radeon_state *rstate, const struct pipe_viewport_state *state);
-static void r600_ucp(struct r600_context *rctx, struct radeon_state *rstate, const struct pipe_clip_state *state);
-static void r600_sampler(struct r600_context *rctx, struct radeon_state *rstate, const struct pipe_sampler_state *state, unsigned id);
-static void r600_sampler_border(struct r600_context *rctx, struct radeon_state *rstate,
-                               const struct pipe_sampler_state *state, unsigned id);
-static void r600_resource(struct pipe_context *ctx, struct radeon_state *rstate, const struct pipe_sampler_view *view, unsigned id);
-static void r600_cb(struct r600_context *rctx, struct radeon_state *rstate,
-                       const struct pipe_framebuffer_state *state, int cb);
-static void r600_db(struct r600_context *rctx, struct radeon_state *rstate,
-                       const struct pipe_framebuffer_state *state);
+
+static void clean_flush(struct r600_context *rctx, struct radeon_state *flush);
+static int setup_cb_flush(struct r600_context *rctx, struct radeon_state *flush);
+static int setup_db_flush(struct r600_context *rctx, struct radeon_state *flush);
 
 static struct r600_context_state *r600_new_context_state(unsigned type)
 {
@@ -65,7 +55,7 @@ static void *r600_create_blend_state(struct pipe_context *ctx,
 
        rstate = r600_new_context_state(pipe_blend_type);
        rstate->state.blend = *state;
-       r600_blend(rctx, &rstate->rstate[0], &rstate->state.blend);
+       rctx->vtbl->blend(rctx, &rstate->rstate[0], &rstate->state.blend);
        
        return rstate;
 }
@@ -98,8 +88,8 @@ static void *r600_create_sampler_state(struct pipe_context *ctx,
 
        rstate = r600_new_context_state(pipe_sampler_type);
        rstate->state.sampler = *state;
-       r600_sampler(rctx, &rstate->rstate[0], &rstate->state.sampler, 0);
-       r600_sampler_border(rctx, &rstate->rstate[1], &rstate->state.sampler, 0);
+       rctx->vtbl->sampler(rctx, &rstate->rstate[0], &rstate->state.sampler, 0);
+       rctx->vtbl->sampler_border(rctx, &rstate->rstate[1], &rstate->state.sampler, 0);
        return rstate;
 }
 
@@ -120,7 +110,6 @@ static void r600_sampler_view_destroy(struct pipe_context *ctx,
 {
        struct r600_context_state *rstate = (struct r600_context_state *)state;
        struct r600_context *rctx = r600_context(ctx);
-       int i;
 
        /* need to search list of vs/ps sampler views and remove it from any - uggh */
        r600_remove_sampler_view(&rctx->ps_sampler, rstate);
@@ -133,6 +122,7 @@ static struct pipe_sampler_view *r600_create_sampler_view(struct pipe_context *c
                                                        const struct pipe_sampler_view *state)
 {
        struct r600_context_state *rstate;
+       struct r600_context *rctx = r600_context(ctx);
 
        rstate = r600_new_context_state(pipe_sampler_view_type);
        rstate->state.sampler_view = *state;
@@ -141,7 +131,7 @@ static struct pipe_sampler_view *r600_create_sampler_view(struct pipe_context *c
        rstate->state.sampler_view.texture = texture;
        rstate->state.sampler_view.reference.count = 1;
        rstate->state.sampler_view.context = ctx;
-       r600_resource(ctx, &rstate->rstate[0], &rstate->state.sampler_view, 0);
+       rctx->vtbl->resource(ctx, &rstate->rstate[0], &rstate->state.sampler_view, 0);
        return &rstate->state.sampler_view;
 }
 
@@ -381,56 +371,10 @@ static void r600_set_clip_state(struct pipe_context *ctx,
 
        rstate = r600_new_context_state(pipe_clip_type);
        rstate->state.clip = *state;
-       r600_ucp(rctx, &rstate->rstate[0], &rstate->state.clip);
+       rctx->vtbl->ucp(rctx, &rstate->rstate[0], &rstate->state.clip);
        rctx->clip = rstate;
 }
 
-static void r600_set_constant_buffer(struct pipe_context *ctx,
-                                       uint shader, uint index,
-                                       struct pipe_resource *buffer)
-{
-       struct r600_screen *rscreen = r600_screen(ctx->screen);
-       struct r600_context *rctx = r600_context(ctx);
-       unsigned nconstant = 0, i, type, shader_class;
-       struct radeon_state *rstate, *rstates;
-       struct pipe_transfer *transfer;
-       u32 *ptr;
-
-       type = R600_STATE_CONSTANT;
-
-       switch (shader) {
-       case PIPE_SHADER_VERTEX:
-               shader_class = R600_SHADER_VS;
-               rstates = rctx->vs_constant;
-               break;
-       case PIPE_SHADER_FRAGMENT:
-               shader_class = R600_SHADER_PS;
-               rstates = rctx->ps_constant;
-               break;
-       default:
-               R600_ERR("unsupported %d\n", shader);
-               return;
-       }
-       if (buffer && buffer->width0 > 0) {
-               nconstant = buffer->width0 / 16;
-               ptr = pipe_buffer_map(ctx, buffer, PIPE_TRANSFER_READ, &transfer);
-               if (ptr == NULL)
-                       return;
-               for (i = 0; i < nconstant; i++) {
-                       rstate = &rstates[i];
-                       radeon_state_init(rstate, rscreen->rw, type, i, shader_class);
-                       rstate->states[R600_PS_CONSTANT__SQ_ALU_CONSTANT0_0] = ptr[i * 4 + 0];
-                       rstate->states[R600_PS_CONSTANT__SQ_ALU_CONSTANT1_0] = ptr[i * 4 + 1];
-                       rstate->states[R600_PS_CONSTANT__SQ_ALU_CONSTANT2_0] = ptr[i * 4 + 2];
-                       rstate->states[R600_PS_CONSTANT__SQ_ALU_CONSTANT3_0] = ptr[i * 4 + 3];
-                       if (radeon_state_pm4(rstate))
-                               return;
-                       radeon_draw_bind(&rctx->draw, rstate);
-               }
-               pipe_buffer_unmap(ctx, buffer, transfer);
-       }
-}
-
 static void r600_set_framebuffer_state(struct pipe_context *ctx,
                                        const struct pipe_framebuffer_state *state)
 {
@@ -438,6 +382,14 @@ static void r600_set_framebuffer_state(struct pipe_context *ctx,
        struct r600_context_state *rstate;
        int i;
 
+       if (rctx->framebuffer) {
+               for (i = 0; i < rctx->framebuffer->state.framebuffer.nr_cbufs; i++)
+                       radeon_draw_unbind(&rctx->draw, &rctx->framebuffer->rstate[i+1]);
+               radeon_draw_unbind(&rctx->draw, &rctx->framebuffer->rstate[0]);
+       }
+       clean_flush(rctx, &rctx->hw_states.cb_flush);
+       clean_flush(rctx, &rctx->hw_states.db_flush);
+
        r600_context_state_decref(rctx->framebuffer);
 
        rstate = r600_new_context_state(pipe_framebuffer_type);
@@ -448,11 +400,15 @@ static void r600_set_framebuffer_state(struct pipe_context *ctx,
        pipe_reference(NULL, &state->zsbuf->reference);
        rctx->framebuffer = rstate;
        for (i = 0; i < state->nr_cbufs; i++) {
-               r600_cb(rctx, &rstate->rstate[i+1], state, i);
+               rctx->vtbl->cb(rctx, &rstate->rstate[i+1], state, i);
        }
        if (state->zsbuf) {
-               r600_db(rctx, &rstate->rstate[0], state);
+               rctx->vtbl->db(rctx, &rstate->rstate[0], state);
        }
+       /* setup flush states */
+       setup_cb_flush(rctx, &rctx->hw_states.cb_flush);
+       setup_db_flush(rctx, &rctx->hw_states.db_flush);
+
        return;
 }
 
@@ -497,6 +453,7 @@ static void r600_set_vertex_buffers(struct pipe_context *ctx,
 {
        struct r600_context *rctx = r600_context(ctx);
        unsigned i;
+       boolean any_user_buffers = FALSE;
 
        for (i = 0; i < rctx->nvertex_buffer; i++) {
                pipe_resource_reference(&rctx->vertex_buffer[i].buffer, NULL);
@@ -504,8 +461,11 @@ static void r600_set_vertex_buffers(struct pipe_context *ctx,
        memcpy(rctx->vertex_buffer, buffers, sizeof(struct pipe_vertex_buffer) * count);
        for (i = 0; i < count; i++) {
                rctx->vertex_buffer[i].buffer = NULL;
+               if (r600_buffer_is_user_buffer(buffers[i].buffer))
+                       any_user_buffers = TRUE;
                pipe_resource_reference(&rctx->vertex_buffer[i].buffer, buffers[i].buffer);
        }
+       rctx->any_user_vbs = any_user_buffers;
        rctx->nvertex_buffer = count;
 }
 
@@ -535,7 +495,7 @@ static void r600_set_viewport_state(struct pipe_context *ctx,
 
        rstate = r600_new_context_state(pipe_viewport_type);
        rstate->state.viewport = *state;
-       r600_viewport(rctx, &rstate->rstate[0], &rstate->state.viewport);
+       rctx->vtbl->viewport(rctx, &rstate->rstate[0], &rstate->state.viewport);
        rctx->viewport = rstate;
 }
 
@@ -566,7 +526,14 @@ void r600_init_state_functions(struct r600_context *rctx)
        rctx->context.delete_vs_state = r600_delete_state;
        rctx->context.set_blend_color = r600_set_blend_color;
        rctx->context.set_clip_state = r600_set_clip_state;
-       rctx->context.set_constant_buffer = r600_set_constant_buffer;
+
+       if (radeon_get_family_class(rctx->rw) == EVERGREEN)
+               rctx->context.set_constant_buffer = eg_set_constant_buffer;
+       else if (rctx->screen->use_mem_constant)
+               rctx->context.set_constant_buffer = r600_set_constant_buffer_mem;
+       else
+               rctx->context.set_constant_buffer = r600_set_constant_buffer_file;
+
        rctx->context.set_fragment_sampler_views = r600_set_ps_sampler_view;
        rctx->context.set_framebuffer_state = r600_set_framebuffer_state;
        rctx->context.set_polygon_stipple = r600_set_polygon_stipple;
@@ -603,6 +570,7 @@ struct r600_context_state *r600_context_state_decref(struct r600_context_state *
        case pipe_framebuffer_type:
                for (i = 0; i < rstate->state.framebuffer.nr_cbufs; i++) {
                        pipe_surface_reference(&rstate->state.framebuffer.cbufs[i], NULL);
+                       radeon_state_fini(&rstate->rstate[i+1]);
                }
                pipe_surface_reference(&rstate->state.framebuffer.zsbuf, NULL);
                break;
@@ -629,643 +597,105 @@ struct r600_context_state *r600_context_state_decref(struct r600_context_state *
        return NULL;
 }
 
-static void r600_blend(struct r600_context *rctx, struct radeon_state *rstate, const struct pipe_blend_state *state)
+static void r600_bind_shader_sampler(struct r600_context *rctx, struct r600_shader_sampler_states *sampler)
 {
-       struct r600_screen *rscreen = rctx->screen;
        int i;
 
-       radeon_state_init(rstate, rscreen->rw, R600_STATE_BLEND, 0, 0);
-       rstate->states[R600_BLEND__CB_BLEND_RED] = fui(rctx->blend_color.color[0]);
-       rstate->states[R600_BLEND__CB_BLEND_GREEN] = fui(rctx->blend_color.color[1]);
-       rstate->states[R600_BLEND__CB_BLEND_BLUE] = fui(rctx->blend_color.color[2]);
-       rstate->states[R600_BLEND__CB_BLEND_ALPHA] = fui(rctx->blend_color.color[3]);
-       rstate->states[R600_BLEND__CB_BLEND0_CONTROL] = 0x00000000;
-       rstate->states[R600_BLEND__CB_BLEND1_CONTROL] = 0x00000000;
-       rstate->states[R600_BLEND__CB_BLEND2_CONTROL] = 0x00000000;
-       rstate->states[R600_BLEND__CB_BLEND3_CONTROL] = 0x00000000;
-       rstate->states[R600_BLEND__CB_BLEND4_CONTROL] = 0x00000000;
-       rstate->states[R600_BLEND__CB_BLEND5_CONTROL] = 0x00000000;
-       rstate->states[R600_BLEND__CB_BLEND6_CONTROL] = 0x00000000;
-       rstate->states[R600_BLEND__CB_BLEND7_CONTROL] = 0x00000000;
-       rstate->states[R600_BLEND__CB_BLEND_CONTROL] = 0x00000000;
-
-       for (i = 0; i < 8; i++) {
-               unsigned eqRGB = state->rt[i].rgb_func;
-               unsigned srcRGB = state->rt[i].rgb_src_factor;
-               unsigned dstRGB = state->rt[i].rgb_dst_factor;
-               
-               unsigned eqA = state->rt[i].alpha_func;
-               unsigned srcA = state->rt[i].alpha_src_factor;
-               unsigned dstA = state->rt[i].alpha_dst_factor;
-               uint32_t bc = 0;
-
-               if (!state->rt[i].blend_enable)
-                       continue;
-
-               bc |= S_028804_COLOR_COMB_FCN(r600_translate_blend_function(eqRGB));
-               bc |= S_028804_COLOR_SRCBLEND(r600_translate_blend_factor(srcRGB));
-               bc |= S_028804_COLOR_DESTBLEND(r600_translate_blend_factor(dstRGB));
-
-               if (srcA != srcRGB || dstA != dstRGB || eqA != eqRGB) {
-                       bc |= S_028804_SEPARATE_ALPHA_BLEND(1);
-                       bc |= S_028804_ALPHA_COMB_FCN(r600_translate_blend_function(eqA));
-                       bc |= S_028804_ALPHA_SRCBLEND(r600_translate_blend_factor(srcA));
-                       bc |= S_028804_ALPHA_DESTBLEND(r600_translate_blend_factor(dstA));
-               }
-
-               rstate->states[R600_BLEND__CB_BLEND0_CONTROL + i] = bc;
-               if (i == 0)
-                       rstate->states[R600_BLEND__CB_BLEND_CONTROL] = bc;
-       }
-
-       radeon_state_pm4(rstate);
-}
-
-static void r600_ucp(struct r600_context *rctx, struct radeon_state *rstate,
-                       const struct pipe_clip_state *state)
-{
-       struct r600_screen *rscreen = rctx->screen;
-
-       radeon_state_init(rstate, rscreen->rw, R600_STATE_UCP, 0, 0);
-
-       for (int i = 0; i < state->nr; i++) {
-               rstate->states[i * 4 + 0] = fui(state->ucp[i][0]);
-               rstate->states[i * 4 + 1] = fui(state->ucp[i][1]);
-               rstate->states[i * 4 + 2] = fui(state->ucp[i][2]);
-               rstate->states[i * 4 + 3] = fui(state->ucp[i][3]);
+       for (i = 0; i < sampler->nsampler; i++) {
+               if (sampler->sampler[i])
+                       radeon_draw_bind(&rctx->draw, sampler->sampler[i]);
        }
-       radeon_state_pm4(rstate);
-}
-
-static void r600_cb(struct r600_context *rctx, struct radeon_state *rstate,
-                       const struct pipe_framebuffer_state *state, int cb)
-{
-       struct r600_screen *rscreen = rctx->screen;
-       struct r600_resource_texture *rtex;
-       struct r600_resource *rbuffer;
-       unsigned level = state->cbufs[cb]->level;
-       unsigned pitch, slice;
-       unsigned color_info;
-       unsigned format, swap, ntype;
-       const struct util_format_description *desc;
-
-       radeon_state_init(rstate, rscreen->rw, R600_STATE_CB0 + cb, 0, 0);
-       rtex = (struct r600_resource_texture*)state->cbufs[cb]->texture;
-       rbuffer = &rtex->resource;
-       rstate->bo[0] = radeon_bo_incref(rscreen->rw, rbuffer->bo);
-       rstate->bo[1] = radeon_bo_incref(rscreen->rw, rbuffer->bo);
-       rstate->bo[2] = radeon_bo_incref(rscreen->rw, rbuffer->bo);
-       rstate->placement[0] = RADEON_GEM_DOMAIN_GTT;
-       rstate->placement[2] = RADEON_GEM_DOMAIN_GTT;
-       rstate->placement[4] = RADEON_GEM_DOMAIN_GTT;
-       rstate->nbo = 3;
-       pitch = (rtex->pitch[level] / rtex->bpt) / 8 - 1;
-       slice = (rtex->pitch[level] / rtex->bpt) * state->cbufs[cb]->height / 64 - 1;
-
-       ntype = 0;
-       desc = util_format_description(rtex->resource.base.b.format);
-       if (desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB)
-               ntype = V_0280A0_NUMBER_SRGB;
-
-       format = r600_translate_colorformat(rtex->resource.base.b.format);
-       swap = r600_translate_colorswap(rtex->resource.base.b.format);
-
-       color_info = S_0280A0_FORMAT(format) |
-               S_0280A0_COMP_SWAP(swap) |
-               S_0280A0_BLEND_CLAMP(1) |
-               S_0280A0_SOURCE_FORMAT(1) |
-               S_0280A0_NUMBER_TYPE(ntype);
-
-       rstate->states[R600_CB0__CB_COLOR0_BASE] = state->cbufs[cb]->offset >> 8;
-       rstate->states[R600_CB0__CB_COLOR0_INFO] = color_info;
-       rstate->states[R600_CB0__CB_COLOR0_SIZE] = S_028060_PITCH_TILE_MAX(pitch) |
-                                               S_028060_SLICE_TILE_MAX(slice);
-       rstate->states[R600_CB0__CB_COLOR0_VIEW] = 0x00000000;
-       rstate->states[R600_CB0__CB_COLOR0_FRAG] = 0x00000000;
-       rstate->states[R600_CB0__CB_COLOR0_TILE] = 0x00000000;
-       rstate->states[R600_CB0__CB_COLOR0_MASK] = 0x00000000;
-       radeon_state_pm4(rstate);
-}
-
-static void r600_db(struct r600_context *rctx, struct radeon_state *rstate,
-                       const struct pipe_framebuffer_state *state)
-{
-       struct r600_screen *rscreen = rctx->screen;
-       struct r600_resource_texture *rtex;
-       struct r600_resource *rbuffer;
-       unsigned level;
-       unsigned pitch, slice, format;
 
-       radeon_state_init(rstate, rscreen->rw, R600_STATE_DB, 0, 0);
-       if (state->zsbuf == NULL)
-               return;
-
-       rtex = (struct r600_resource_texture*)state->zsbuf->texture;
-       rtex->tilled = 1;
-       rtex->array_mode = 2;
-       rtex->tile_type = 1;
-       rtex->depth = 1;
-       rbuffer = &rtex->resource;
-
-       rstate->bo[0] = radeon_bo_incref(rscreen->rw, rbuffer->bo);
-       rstate->nbo = 1;
-       rstate->placement[0] = RADEON_GEM_DOMAIN_VRAM;
-       level = state->zsbuf->level;
-       pitch = (rtex->pitch[level] / rtex->bpt) / 8 - 1;
-       slice = (rtex->pitch[level] / rtex->bpt) * state->zsbuf->height / 64 - 1;
-       format = r600_translate_dbformat(state->zsbuf->texture->format);
-       rstate->states[R600_DB__DB_DEPTH_BASE] = state->zsbuf->offset >> 8;
-       rstate->states[R600_DB__DB_DEPTH_INFO] = S_028010_ARRAY_MODE(rtex->array_mode) |
-                                       S_028010_FORMAT(format);
-       rstate->states[R600_DB__DB_DEPTH_VIEW] = 0x00000000;
-       rstate->states[R600_DB__DB_PREFETCH_LIMIT] = (state->zsbuf->height / 8) -1;
-       rstate->states[R600_DB__DB_DEPTH_SIZE] = S_028000_PITCH_TILE_MAX(pitch) |
-                                               S_028000_SLICE_TILE_MAX(slice);
-       radeon_state_pm4(rstate);
-}
-
-static void r600_rasterizer(struct r600_context *rctx, struct radeon_state *rstate)
-{
-       const struct pipe_rasterizer_state *state = &rctx->rasterizer->state.rasterizer;
-       const struct pipe_framebuffer_state *fb = &rctx->framebuffer->state.framebuffer;
-       const struct pipe_clip_state *clip = NULL;
-       struct r600_screen *rscreen = rctx->screen;
-       float offset_units = 0, offset_scale = 0;
-       char depth = 0;
-       unsigned offset_db_fmt_cntl = 0;
-       unsigned tmp;
-       unsigned prov_vtx = 1;
-
-       if (rctx->clip)
-               clip = &rctx->clip->state.clip;
-       if (fb->zsbuf) {
-               offset_units = state->offset_units;
-               offset_scale = state->offset_scale * 12.0f;
-               switch (fb->zsbuf->texture->format) {
-               case PIPE_FORMAT_Z24X8_UNORM:
-               case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
-                       depth = -24;
-                       offset_units *= 2.0f;
-                       break;
-               case PIPE_FORMAT_Z32_FLOAT:
-                       depth = -23;
-                       offset_units *= 1.0f;
-                       offset_db_fmt_cntl |= S_028DF8_POLY_OFFSET_DB_IS_FLOAT_FMT(1);
-                       break;
-               case PIPE_FORMAT_Z16_UNORM:
-                       depth = -16;
-                       offset_units *= 4.0f;
-                       break;
-               default:
-                       R600_ERR("unsupported %d\n", fb->zsbuf->texture->format);
-                       return;
-               }
-       }
-       offset_db_fmt_cntl |= S_028DF8_POLY_OFFSET_NEG_NUM_DB_BITS(depth);
-
-       if (state->flatshade_first)
-               prov_vtx = 0;
-
-       rctx->flat_shade = state->flatshade;
-       radeon_state_init(rstate, rscreen->rw, R600_STATE_RASTERIZER, 0, 0);
-       rstate->states[R600_RASTERIZER__SPI_INTERP_CONTROL_0] = 0x00000001;
-       if (state->sprite_coord_enable) {
-               rstate->states[R600_RASTERIZER__SPI_INTERP_CONTROL_0] |=
-                               S_0286D4_PNT_SPRITE_ENA(1) |
-                               S_0286D4_PNT_SPRITE_OVRD_X(2) |
-                               S_0286D4_PNT_SPRITE_OVRD_Y(3) |
-                               S_0286D4_PNT_SPRITE_OVRD_Z(0) |
-                               S_0286D4_PNT_SPRITE_OVRD_W(1);
-               if (state->sprite_coord_mode != PIPE_SPRITE_COORD_UPPER_LEFT) {
-                       rstate->states[R600_RASTERIZER__SPI_INTERP_CONTROL_0] |=
-                                       S_0286D4_PNT_SPRITE_TOP_1(1);
-               }
-       }
-       rstate->states[R600_RASTERIZER__PA_CL_CLIP_CNTL] = 0;
-       if (clip) {
-               rstate->states[R600_RASTERIZER__PA_CL_CLIP_CNTL] = S_028810_PS_UCP_MODE(3) | ((1 << clip->nr) - 1);
-               rstate->states[R600_RASTERIZER__PA_CL_CLIP_CNTL] |= S_028810_ZCLIP_NEAR_DISABLE(clip->depth_clamp);
-               rstate->states[R600_RASTERIZER__PA_CL_CLIP_CNTL] |= S_028810_ZCLIP_FAR_DISABLE(clip->depth_clamp);
+       for (i = 0; i < sampler->nborder; i++) {
+               if (sampler->border[i])
+                       radeon_draw_bind(&rctx->draw, sampler->border[i]);
        }
-       rstate->states[R600_RASTERIZER__PA_SU_SC_MODE_CNTL] =
-               S_028814_PROVOKING_VTX_LAST(prov_vtx) |
-               S_028814_CULL_FRONT((state->cull_face & PIPE_FACE_FRONT) ? 1 : 0) |
-               S_028814_CULL_BACK((state->cull_face & PIPE_FACE_BACK) ? 1 : 0) |
-               S_028814_FACE(!state->front_ccw) |
-               S_028814_POLY_OFFSET_FRONT_ENABLE(state->offset_tri) |
-               S_028814_POLY_OFFSET_BACK_ENABLE(state->offset_tri) |
-               S_028814_POLY_OFFSET_PARA_ENABLE(state->offset_tri);
-       rstate->states[R600_RASTERIZER__PA_CL_VS_OUT_CNTL] =
-                       S_02881C_USE_VTX_POINT_SIZE(state->point_size_per_vertex) |
-                       S_02881C_VS_OUT_MISC_VEC_ENA(state->point_size_per_vertex);
-       rstate->states[R600_RASTERIZER__PA_CL_NANINF_CNTL] = 0x00000000;
-       /* point size 12.4 fixed point */
-       tmp = (unsigned)(state->point_size * 8.0);
-       rstate->states[R600_RASTERIZER__PA_SU_POINT_SIZE] = S_028A00_HEIGHT(tmp) | S_028A00_WIDTH(tmp);
-       rstate->states[R600_RASTERIZER__PA_SU_POINT_MINMAX] = 0x80000000;
-       rstate->states[R600_RASTERIZER__PA_SU_LINE_CNTL] = 0x00000008;
-       rstate->states[R600_RASTERIZER__PA_SC_LINE_STIPPLE] = 0x00000005;
-       rstate->states[R600_RASTERIZER__PA_SC_MPASS_PS_CNTL] = 0x00000000;
-       rstate->states[R600_RASTERIZER__PA_SC_LINE_CNTL] = 0x00000400;
-       rstate->states[R600_RASTERIZER__PA_CL_GB_VERT_CLIP_ADJ] = 0x3F800000;
-       rstate->states[R600_RASTERIZER__PA_CL_GB_VERT_DISC_ADJ] = 0x3F800000;
-       rstate->states[R600_RASTERIZER__PA_CL_GB_HORZ_CLIP_ADJ] = 0x3F800000;
-       rstate->states[R600_RASTERIZER__PA_CL_GB_HORZ_DISC_ADJ] = 0x3F800000;
-       rstate->states[R600_RASTERIZER__PA_SU_POLY_OFFSET_DB_FMT_CNTL] = offset_db_fmt_cntl;
-       rstate->states[R600_RASTERIZER__PA_SU_POLY_OFFSET_CLAMP] = 0x00000000;
-       rstate->states[R600_RASTERIZER__PA_SU_POLY_OFFSET_FRONT_SCALE] = fui(offset_scale);
-       rstate->states[R600_RASTERIZER__PA_SU_POLY_OFFSET_FRONT_OFFSET] = fui(offset_units);
-       rstate->states[R600_RASTERIZER__PA_SU_POLY_OFFSET_BACK_SCALE] = fui(offset_scale);
-       rstate->states[R600_RASTERIZER__PA_SU_POLY_OFFSET_BACK_OFFSET] = fui(offset_units);
-       radeon_state_pm4(rstate);
-}
 
-static void r600_scissor(struct r600_context *rctx, struct radeon_state *rstate)
-{
-       const struct pipe_scissor_state *state = &rctx->scissor->state.scissor;
-       const struct pipe_framebuffer_state *fb = &rctx->framebuffer->state.framebuffer;
-       struct r600_screen *rscreen = rctx->screen;
-       unsigned minx, maxx, miny, maxy;
-       u32 tl, br;
-
-       if (state == NULL) {
-               minx = 0;
-               miny = 0;
-               maxx = fb->cbufs[0]->width;
-               maxy = fb->cbufs[0]->height;
-       } else {
-               minx = state->minx;
-               miny = state->miny;
-               maxx = state->maxx;
-               maxy = state->maxy;
+       for (i = 0; i < sampler->nview; i++) {
+               if (sampler->view[i])
+                       radeon_draw_bind(&rctx->draw, sampler->view[i]);
        }
-       tl = S_028240_TL_X(minx) | S_028240_TL_Y(miny) | S_028240_WINDOW_OFFSET_DISABLE(1);
-       br = S_028244_BR_X(maxx) | S_028244_BR_Y(maxy);
-       radeon_state_init(rstate, rscreen->rw, R600_STATE_SCISSOR, 0, 0);
-       rstate->states[R600_SCISSOR__PA_SC_SCREEN_SCISSOR_TL] = tl;
-       rstate->states[R600_SCISSOR__PA_SC_SCREEN_SCISSOR_BR] = br;
-       rstate->states[R600_SCISSOR__PA_SC_WINDOW_OFFSET] = 0x00000000;
-       rstate->states[R600_SCISSOR__PA_SC_WINDOW_SCISSOR_TL] = tl;
-       rstate->states[R600_SCISSOR__PA_SC_WINDOW_SCISSOR_BR] = br;
-       rstate->states[R600_SCISSOR__PA_SC_CLIPRECT_RULE] = 0x0000FFFF;
-       rstate->states[R600_SCISSOR__PA_SC_CLIPRECT_0_TL] = tl;
-       rstate->states[R600_SCISSOR__PA_SC_CLIPRECT_0_BR] = br;
-       rstate->states[R600_SCISSOR__PA_SC_CLIPRECT_1_TL] = tl;
-       rstate->states[R600_SCISSOR__PA_SC_CLIPRECT_1_BR] = br;
-       rstate->states[R600_SCISSOR__PA_SC_CLIPRECT_2_TL] = tl;
-       rstate->states[R600_SCISSOR__PA_SC_CLIPRECT_2_BR] = br;
-       rstate->states[R600_SCISSOR__PA_SC_CLIPRECT_3_TL] = tl;
-       rstate->states[R600_SCISSOR__PA_SC_CLIPRECT_3_BR] = br;
-       rstate->states[R600_SCISSOR__PA_SC_EDGERULE] = 0xAAAAAAAA;
-       rstate->states[R600_SCISSOR__PA_SC_GENERIC_SCISSOR_TL] = tl;
-       rstate->states[R600_SCISSOR__PA_SC_GENERIC_SCISSOR_BR] = br;
-       rstate->states[R600_SCISSOR__PA_SC_VPORT_SCISSOR_0_TL] = tl;
-       rstate->states[R600_SCISSOR__PA_SC_VPORT_SCISSOR_0_BR] = br;
-       radeon_state_pm4(rstate);
-}
-
-static void r600_viewport(struct r600_context *rctx, struct radeon_state *rstate, const struct pipe_viewport_state *state)
-{
-       struct r600_screen *rscreen = rctx->screen;
-
-       radeon_state_init(rstate, rscreen->rw, R600_STATE_VIEWPORT, 0, 0);
-       rstate->states[R600_VIEWPORT__PA_SC_VPORT_ZMIN_0] = 0x00000000;
-       rstate->states[R600_VIEWPORT__PA_SC_VPORT_ZMAX_0] = 0x3F800000;
-       rstate->states[R600_VIEWPORT__PA_CL_VPORT_XSCALE_0] = fui(state->scale[0]);
-       rstate->states[R600_VIEWPORT__PA_CL_VPORT_YSCALE_0] = fui(state->scale[1]);
-       rstate->states[R600_VIEWPORT__PA_CL_VPORT_ZSCALE_0] = fui(state->scale[2]);
-       rstate->states[R600_VIEWPORT__PA_CL_VPORT_XOFFSET_0] = fui(state->translate[0]);
-       rstate->states[R600_VIEWPORT__PA_CL_VPORT_YOFFSET_0] = fui(state->translate[1]);
-       rstate->states[R600_VIEWPORT__PA_CL_VPORT_ZOFFSET_0] = fui(state->translate[2]);
-       rstate->states[R600_VIEWPORT__PA_CL_VTE_CNTL] = 0x0000043F;
-       radeon_state_pm4(rstate);
 }
 
-static void r600_dsa(struct r600_context *rctx, struct radeon_state *rstate)
+static void clean_flush(struct r600_context *rctx, struct radeon_state *flush)
 {
-       const struct pipe_depth_stencil_alpha_state *state = &rctx->dsa->state.dsa;
-       const struct pipe_stencil_ref *stencil_ref = &rctx->stencil_ref->state.stencil_ref;
        struct r600_screen *rscreen = rctx->screen;
-       unsigned db_depth_control, alpha_test_control, alpha_ref, db_shader_control;
-       unsigned stencil_ref_mask, stencil_ref_mask_bf, db_render_override, db_render_control;
-       struct r600_shader *rshader;
-       struct r600_query *rquery;
-       boolean query_running;
        int i;
 
-       if (rctx->ps_shader == NULL) {
-               return;
-       }
-       radeon_state_init(rstate, rscreen->rw, R600_STATE_DSA, 0, 0);
-
-       db_shader_control = 0x210;
-       rshader = &rctx->ps_shader->shader;
-       if (rshader->uses_kill)
-               db_shader_control |= (1 << 6);
-       for (i = 0; i < rshader->noutput; i++) {
-               if (rshader->output[i].name == TGSI_SEMANTIC_POSITION)
-                       db_shader_control |= 1;
-       }
-       stencil_ref_mask = 0;
-       stencil_ref_mask_bf = 0;
-       db_depth_control = S_028800_Z_ENABLE(state->depth.enabled) |
-               S_028800_Z_WRITE_ENABLE(state->depth.writemask) |
-               S_028800_ZFUNC(state->depth.func);
-       /* set stencil enable */
-
-       if (state->stencil[0].enabled) {
-               db_depth_control |= S_028800_STENCIL_ENABLE(1);
-               db_depth_control |= S_028800_STENCILFUNC(r600_translate_ds_func(state->stencil[0].func));
-               db_depth_control |= S_028800_STENCILFAIL(r600_translate_stencil_op(state->stencil[0].fail_op));
-               db_depth_control |= S_028800_STENCILZPASS(r600_translate_stencil_op(state->stencil[0].zpass_op));
-               db_depth_control |= S_028800_STENCILZFAIL(r600_translate_stencil_op(state->stencil[0].zfail_op));
-
-               stencil_ref_mask = S_028430_STENCILMASK(state->stencil[0].valuemask) |
-                       S_028430_STENCILWRITEMASK(state->stencil[0].writemask);
-               stencil_ref_mask |= S_028430_STENCILREF(stencil_ref->ref_value[0]);
-               if (state->stencil[1].enabled) {
-                       db_depth_control |= S_028800_BACKFACE_ENABLE(1);
-                       db_depth_control |= S_028800_STENCILFUNC_BF(r600_translate_ds_func(state->stencil[1].func));
-                       db_depth_control |= S_028800_STENCILFAIL_BF(r600_translate_stencil_op(state->stencil[1].fail_op));
-                       db_depth_control |= S_028800_STENCILZPASS_BF(r600_translate_stencil_op(state->stencil[1].zpass_op));
-                       db_depth_control |= S_028800_STENCILZFAIL_BF(r600_translate_stencil_op(state->stencil[1].zfail_op));
-                       stencil_ref_mask_bf = S_028434_STENCILMASK_BF(state->stencil[1].valuemask) |
-                               S_028434_STENCILWRITEMASK_BF(state->stencil[1].writemask);
-                       stencil_ref_mask_bf |= S_028430_STENCILREF(stencil_ref->ref_value[1]);
-               }
-       }
-
-       alpha_test_control = 0;
-       alpha_ref = 0;
-       if (state->alpha.enabled) {
-               alpha_test_control = S_028410_ALPHA_FUNC(state->alpha.func);
-               alpha_test_control |= S_028410_ALPHA_TEST_ENABLE(1);
-               alpha_ref = fui(state->alpha.ref_value);
-       }
-
-       db_render_control = S_028D0C_STENCIL_COMPRESS_DISABLE(1) |
-               S_028D0C_DEPTH_COMPRESS_DISABLE(1);
-       db_render_override = S_028D10_FORCE_HIZ_ENABLE(V_028D10_FORCE_DISABLE) |
-               S_028D10_FORCE_HIS_ENABLE0(V_028D10_FORCE_DISABLE) |
-               S_028D10_FORCE_HIS_ENABLE1(V_028D10_FORCE_DISABLE);
-
-       query_running = false;
-
-       LIST_FOR_EACH_ENTRY(rquery, &rctx->query_list, list) {
-               if (rquery->state & R600_QUERY_STATE_STARTED) {
-                       query_running = true;
-               }
-       }
-
-       if (query_running) {
-               db_render_override |= S_028D10_NOOP_CULL_DISABLE(1);
-               if (rscreen->chip_class == R700)
-                       db_render_control |= S_028D0C_R700_PERFECT_ZPASS_COUNTS(1);
-       }
-
-       rstate->states[R600_DSA__DB_STENCIL_CLEAR] = 0x00000000;
-       rstate->states[R600_DSA__DB_DEPTH_CLEAR] = 0x3F800000;
-       rstate->states[R600_DSA__SX_ALPHA_TEST_CONTROL] = alpha_test_control;
-       rstate->states[R600_DSA__DB_STENCILREFMASK] = stencil_ref_mask;
-       rstate->states[R600_DSA__DB_STENCILREFMASK_BF] = stencil_ref_mask_bf;
-       rstate->states[R600_DSA__SX_ALPHA_REF] = alpha_ref;
-       rstate->states[R600_DSA__SPI_FOG_FUNC_SCALE] = 0x00000000;
-       rstate->states[R600_DSA__SPI_FOG_FUNC_BIAS] = 0x00000000;
-       rstate->states[R600_DSA__SPI_FOG_CNTL] = 0x00000000;
-       rstate->states[R600_DSA__DB_DEPTH_CONTROL] = db_depth_control;
-       rstate->states[R600_DSA__DB_SHADER_CONTROL] = db_shader_control;
-       rstate->states[R600_DSA__DB_RENDER_CONTROL] = db_render_control;
-       rstate->states[R600_DSA__DB_RENDER_OVERRIDE] = db_render_override;
-         
-       rstate->states[R600_DSA__DB_SRESULTS_COMPARE_STATE1] = 0x00000000;
-       rstate->states[R600_DSA__DB_PRELOAD_CONTROL] = 0x00000000;
-       rstate->states[R600_DSA__DB_ALPHA_TO_MASK] = 0x0000AA00;
-       radeon_state_pm4(rstate);
-}
-
-
-static INLINE u32 S_FIXED(float value, u32 frac_bits)
-{
-       return value * (1 << frac_bits);
-}
-
-static void r600_sampler_border(struct r600_context *rctx, struct radeon_state *rstate,
-                               const struct pipe_sampler_state *state, unsigned id)
-{
-       struct r600_screen *rscreen = rctx->screen;
-       union util_color uc;
-
-       util_pack_color(state->border_color, PIPE_FORMAT_B8G8R8A8_UNORM, &uc);
-
-       radeon_state_init(rstate, rscreen->rw, R600_STATE_SAMPLER_BORDER, id, R600_SHADER_PS);
-       if (uc.ui) {
-               rstate->states[R600_PS_SAMPLER_BORDER__TD_PS_SAMPLER0_BORDER_RED] = fui(state->border_color[0]);
-               rstate->states[R600_PS_SAMPLER_BORDER__TD_PS_SAMPLER0_BORDER_GREEN] = fui(state->border_color[1]);
-               rstate->states[R600_PS_SAMPLER_BORDER__TD_PS_SAMPLER0_BORDER_BLUE] = fui(state->border_color[2]);
-               rstate->states[R600_PS_SAMPLER_BORDER__TD_PS_SAMPLER0_BORDER_ALPHA] = fui(state->border_color[3]);
+       for (i = 0 ; i < flush->nbo; i++) {
+               radeon_ws_bo_reference(rscreen->rw, &flush->bo[i], NULL);
        }
-       radeon_state_pm4(rstate);
-}
-
-static void r600_sampler(struct r600_context *rctx, struct radeon_state *rstate,
-                       const struct pipe_sampler_state *state, unsigned id)
-{
-       struct r600_screen *rscreen = rctx->screen;
-       union util_color uc;
-
-       util_pack_color(state->border_color, PIPE_FORMAT_B8G8R8A8_UNORM, &uc);
-
-       radeon_state_init(rstate, rscreen->rw, R600_STATE_SAMPLER, id, R600_SHADER_PS);
-       rstate->states[R600_PS_SAMPLER__SQ_TEX_SAMPLER_WORD0_0] =
-                       S_03C000_CLAMP_X(r600_tex_wrap(state->wrap_s)) |
-                       S_03C000_CLAMP_Y(r600_tex_wrap(state->wrap_t)) |
-                       S_03C000_CLAMP_Z(r600_tex_wrap(state->wrap_r)) |
-                       S_03C000_XY_MAG_FILTER(r600_tex_filter(state->mag_img_filter)) |
-                       S_03C000_XY_MIN_FILTER(r600_tex_filter(state->min_img_filter)) |
-                       S_03C000_MIP_FILTER(r600_tex_mipfilter(state->min_mip_filter)) |
-                       S_03C000_DEPTH_COMPARE_FUNCTION(r600_tex_compare(state->compare_func)) |
-                       S_03C000_BORDER_COLOR_TYPE(uc.ui ? V_03C000_SQ_TEX_BORDER_COLOR_REGISTER : 0);
-       /* FIXME LOD it depends on texture base level ... */
-       rstate->states[R600_PS_SAMPLER__SQ_TEX_SAMPLER_WORD1_0] =
-                       S_03C004_MIN_LOD(S_FIXED(CLAMP(state->min_lod, 0, 15), 6)) |
-                       S_03C004_MAX_LOD(S_FIXED(CLAMP(state->max_lod, 0, 15), 6)) |
-                       S_03C004_LOD_BIAS(S_FIXED(CLAMP(state->lod_bias, -16, 16), 6));
-       rstate->states[R600_PS_SAMPLER__SQ_TEX_SAMPLER_WORD2_0] = S_03C008_TYPE(1);
-       radeon_state_pm4(rstate);
-
+       flush->nbo = 0;
+       radeon_state_fini(flush);
 }
 
-
-static void r600_resource(struct pipe_context *ctx, struct radeon_state *rstate,
-                       const struct pipe_sampler_view *view, unsigned id)
+static int setup_cb_flush(struct r600_context *rctx, struct radeon_state *flush)
 {
-       struct r600_context *rctx = r600_context(ctx);
        struct r600_screen *rscreen = rctx->screen;
-       const struct util_format_description *desc;
-       struct r600_resource_texture *tmp;
+       struct r600_resource_texture *rtex;
        struct r600_resource *rbuffer;
-       unsigned format;
-       uint32_t word4 = 0, yuv_format = 0, pitch = 0;
-       unsigned char swizzle[4], array_mode = 0, tile_type = 0;
-       int r;
-
-       rstate->cpm4 = 0;
-       swizzle[0] = view->swizzle_r;
-       swizzle[1] = view->swizzle_g;
-       swizzle[2] = view->swizzle_b;
-       swizzle[3] = view->swizzle_a;
-       format = r600_translate_texformat(view->texture->format,
-                                         swizzle,
-                                         &word4, &yuv_format);
-       if (format == ~0) {
-               return;
-       }
-       desc = util_format_description(view->texture->format);
-       if (desc == NULL) {
-               R600_ERR("unknow format %d\n", view->texture->format);
-               return;
-       }
-       radeon_state_init(rstate, rscreen->rw, R600_STATE_RESOURCE, id, R600_SHADER_PS);
-       tmp = (struct r600_resource_texture*)view->texture;
-       rbuffer = &tmp->resource;
-       if (tmp->depth) {
-               r = r600_texture_from_depth(ctx, tmp, view->first_level);
-               if (r) {
-                       return;
-               }
-               rstate->bo[0] = radeon_bo_incref(rscreen->rw, tmp->uncompressed);
-               rstate->bo[1] = radeon_bo_incref(rscreen->rw, tmp->uncompressed);
-       } else {
-               rstate->bo[0] = radeon_bo_incref(rscreen->rw, rbuffer->bo);
-               rstate->bo[1] = radeon_bo_incref(rscreen->rw, rbuffer->bo);
-       }
-       rstate->nbo = 2;
-       rstate->placement[0] = RADEON_GEM_DOMAIN_GTT;
-       rstate->placement[1] = RADEON_GEM_DOMAIN_GTT;
-       rstate->placement[2] = RADEON_GEM_DOMAIN_GTT;
-       rstate->placement[3] = RADEON_GEM_DOMAIN_GTT;
-
-       pitch = (tmp->pitch[0] / tmp->bpt);
-       pitch = (pitch + 0x7) & ~0x7;
-
-       /* FIXME properly handle first level != 0 */
-       rstate->states[R600_PS_RESOURCE__RESOURCE0_WORD0] =
-                       S_038000_DIM(r600_tex_dim(view->texture->target)) |
-                       S_038000_TILE_MODE(array_mode) |
-                       S_038000_TILE_TYPE(tile_type) |
-                       S_038000_PITCH((pitch / 8) - 1) |
-                       S_038000_TEX_WIDTH(view->texture->width0 - 1);
-       rstate->states[R600_PS_RESOURCE__RESOURCE0_WORD1] =
-                       S_038004_TEX_HEIGHT(view->texture->height0 - 1) |
-                       S_038004_TEX_DEPTH(view->texture->depth0 - 1) |
-                       S_038004_DATA_FORMAT(format);
-       rstate->states[R600_PS_RESOURCE__RESOURCE0_WORD2] = tmp->offset[0] >> 8;
-       rstate->states[R600_PS_RESOURCE__RESOURCE0_WORD3] = tmp->offset[1] >> 8;
-       rstate->states[R600_PS_RESOURCE__RESOURCE0_WORD4] =
-                       word4 | 
-                       S_038010_NUM_FORMAT_ALL(V_038010_SQ_NUM_FORMAT_NORM) |
-                       S_038010_SRF_MODE_ALL(V_038010_SFR_MODE_NO_ZERO) |
-                       S_038010_REQUEST_SIZE(1) |
-                       S_038010_BASE_LEVEL(view->first_level);
-       rstate->states[R600_PS_RESOURCE__RESOURCE0_WORD5] =
-                       S_038014_LAST_LEVEL(view->last_level) |
-                       S_038014_BASE_ARRAY(0) |
-                       S_038014_LAST_ARRAY(0);
-       rstate->states[R600_PS_RESOURCE__RESOURCE0_WORD6] =
-                       S_038018_TYPE(V_038010_SQ_TEX_VTX_VALID_TEXTURE);
-       radeon_state_pm4(rstate);
-}
-
-static void r600_cb_cntl(struct r600_context *rctx, struct radeon_state *rstate)
-{
-       struct r600_screen *rscreen = rctx->screen;
-       const struct pipe_blend_state *pbs = &rctx->blend->state.blend;
-       int nr_cbufs = rctx->framebuffer->state.framebuffer.nr_cbufs;
-       uint32_t color_control, target_mask, shader_mask;
+       struct pipe_surface *surf;
        int i;
 
-       target_mask = 0;
-       shader_mask = 0;
-       color_control = S_028808_PER_MRT_BLEND(1);
-
-       for (i = 0; i < nr_cbufs; i++) {
-               shader_mask |= 0xf << (i * 4);
-       }
-
-       if (pbs->logicop_enable) {
-               color_control |= (pbs->logicop_func << 16) | (pbs->logicop_func << 20);
-       } else {
-               color_control |= (0xcc << 16);
-       }
+       radeon_state_init(flush, rscreen->rw, R600_STATE_CB_FLUSH, 0, 0);
 
-       if (pbs->independent_blend_enable) {
-               for (i = 0; i < nr_cbufs; i++) {
-                       if (pbs->rt[i].blend_enable) {
-                               color_control |= S_028808_TARGET_BLEND_ENABLE(1 << i);
-                       }
-                       target_mask |= (pbs->rt[i].colormask << (4 * i));
-               }
-       } else {
-               for (i = 0; i < nr_cbufs; i++) {
-                       if (pbs->rt[0].blend_enable) {
-                               color_control |= S_028808_TARGET_BLEND_ENABLE(1 << i);
-                       }
-                       target_mask |= (pbs->rt[0].colormask << (4 * i));
-               }
+       for (i = 0; i < rctx->framebuffer->state.framebuffer.nr_cbufs; i++) {
+               surf = rctx->framebuffer->state.framebuffer.cbufs[i];
+               
+               rtex = (struct r600_resource_texture*)surf->texture;
+               rbuffer = &rtex->resource;
+               /* just need to the bo to the flush list */
+               radeon_ws_bo_reference(rscreen->rw, &flush->bo[i], rbuffer->bo);
+               flush->placement[i] = RADEON_GEM_DOMAIN_VRAM;
        }
-       radeon_state_init(rstate, rscreen->rw, R600_STATE_CB_CNTL, 0, 0);
-       rstate->states[R600_CB_CNTL__CB_SHADER_MASK] = shader_mask;
-       rstate->states[R600_CB_CNTL__CB_TARGET_MASK] = target_mask;
-       rstate->states[R600_CB_CNTL__CB_COLOR_CONTROL] = color_control;
-       rstate->states[R600_CB_CNTL__PA_SC_AA_CONFIG] = 0x00000000;
-       rstate->states[R600_CB_CNTL__PA_SC_AA_SAMPLE_LOCS_MCTX] = 0x00000000;
-       rstate->states[R600_CB_CNTL__PA_SC_AA_SAMPLE_LOCS_8S_WD1_MCTX] = 0x00000000;
-       rstate->states[R600_CB_CNTL__CB_CLRCMP_CONTROL] = 0x01000000;
-       rstate->states[R600_CB_CNTL__CB_CLRCMP_SRC] = 0x00000000;
-       rstate->states[R600_CB_CNTL__CB_CLRCMP_DST] = 0x000000FF;
-       rstate->states[R600_CB_CNTL__CB_CLRCMP_MSK] = 0xFFFFFFFF;
-       rstate->states[R600_CB_CNTL__PA_SC_AA_MASK] = 0xFFFFFFFF;
-       radeon_state_pm4(rstate);
+       flush->nbo = rctx->framebuffer->state.framebuffer.nr_cbufs;
+       return radeon_state_pm4(flush);
 }
 
-static void r600_bind_shader_sampler(struct r600_context *rctx, struct r600_shader_sampler_states *sampler)
+static int setup_db_flush(struct r600_context *rctx, struct radeon_state *flush)
 {
-       int i;
+       struct r600_screen *rscreen = rctx->screen;
+       struct r600_resource_texture *rtex;
+       struct r600_resource *rbuffer;
+       struct pipe_surface *surf;
 
-       for (i = 0; i < sampler->nsampler; i++) {
-               if (sampler->sampler[i])
-                       radeon_draw_bind(&rctx->draw, sampler->sampler[i]);
-       }
+       surf = rctx->framebuffer->state.framebuffer.zsbuf;
 
-       for (i = 0; i < sampler->nborder; i++) {
-               if (sampler->border[i])
-                       radeon_draw_bind(&rctx->draw, sampler->border[i]);
-       }
+       if (!surf)
+               return 0;
+               
+       radeon_state_init(flush, rscreen->rw, R600_STATE_DB_FLUSH, 0, 0);
+       rtex = (struct r600_resource_texture*)surf->texture;
+       rbuffer = &rtex->resource;
+       /* just need to the bo to the flush list */
+       radeon_ws_bo_reference(rscreen->rw, &flush->bo[0], rbuffer->bo);
+       flush->placement[0] = RADEON_GEM_DOMAIN_VRAM;
 
-       for (i = 0; i < sampler->nview; i++) {
-               if (sampler->view[i])
-                       radeon_draw_bind(&rctx->draw, sampler->view[i]);
-       }
+       flush->nbo = 1;
+       return radeon_state_pm4(flush);
 }
 
 int r600_context_hw_states(struct pipe_context *ctx)
 {
        struct r600_context *rctx = r600_context(ctx);
        unsigned i;
-
+       
        /* build new states */
-       r600_rasterizer(rctx, &rctx->hw_states.rasterizer);
-       r600_scissor(rctx, &rctx->hw_states.scissor);
-       r600_dsa(rctx, &rctx->hw_states.dsa);
-       r600_cb_cntl(rctx, &rctx->hw_states.cb_cntl);
-
+       rctx->vtbl->rasterizer(rctx, &rctx->hw_states.rasterizer);
+       rctx->vtbl->scissor(rctx, &rctx->hw_states.scissor);
+       rctx->vtbl->dsa(rctx, &rctx->hw_states.dsa);
+       rctx->vtbl->cb_cntl(rctx, &rctx->hw_states.cb_cntl);
+                                                              
        /* bind states */
+       radeon_draw_bind(&rctx->draw, &rctx->config);
+
        radeon_draw_bind(&rctx->draw, &rctx->hw_states.rasterizer);
        radeon_draw_bind(&rctx->draw, &rctx->hw_states.scissor);
        radeon_draw_bind(&rctx->draw, &rctx->hw_states.dsa);
        radeon_draw_bind(&rctx->draw, &rctx->hw_states.cb_cntl);
 
-       radeon_draw_bind(&rctx->draw, &rctx->config);
+       radeon_draw_bind(&rctx->draw, &rctx->hw_states.db_flush);
+       radeon_draw_bind(&rctx->draw, &rctx->hw_states.cb_flush);
 
        if (rctx->viewport) {
                radeon_draw_bind(&rctx->draw, &rctx->viewport->rstate[0]);