gallium: change set_constant_buffer to be UBO-friendly
[mesa.git] / src / gallium / drivers / r600 / r600_state.c
index a13c9944d44b039d5b03e5173749ea05e9307db8..1e7c5a43c02be85d7337d88480aa5b6176cbd693 100644 (file)
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+#include "r600_formats.h"
+#include "r600d.h"
 
-#include <stdio.h>
-#include <errno.h>
-#include "pipe/p_defines.h"
-#include "pipe/p_state.h"
-#include "pipe/p_context.h"
-#include "tgsi/tgsi_scan.h"
-#include "tgsi/tgsi_parse.h"
-#include "tgsi/tgsi_util.h"
-#include "util/u_double_list.h"
+#include "pipe/p_shader_tokens.h"
 #include "util/u_pack_color.h"
 #include "util/u_memory.h"
-#include "util/u_inlines.h"
 #include "util/u_framebuffer.h"
-#include "util/u_transfer.h"
-#include "pipebuffer/pb_buffer.h"
-#include "r600.h"
-#include "r600d.h"
-#include "r600_resource.h"
-#include "r600_shader.h"
-#include "r600_pipe.h"
-#include "r600_formats.h"
+#include "util/u_dual_blend.h"
 
 static uint32_t r600_translate_blend_function(int blend_func)
 {
@@ -156,17 +142,44 @@ static uint32_t r600_translate_colorswap(enum pipe_format format)
        switch (format) {
        /* 8-bit buffers. */
        case PIPE_FORMAT_A8_UNORM:
+       case PIPE_FORMAT_A8_SNORM:
        case PIPE_FORMAT_A8_UINT:
        case PIPE_FORMAT_A8_SINT:
+       case PIPE_FORMAT_A16_UNORM:
+       case PIPE_FORMAT_A16_SNORM:
+       case PIPE_FORMAT_A16_UINT:
+       case PIPE_FORMAT_A16_SINT:
+       case PIPE_FORMAT_A16_FLOAT:
+       case PIPE_FORMAT_A32_UINT:
+       case PIPE_FORMAT_A32_SINT:
+       case PIPE_FORMAT_A32_FLOAT:
        case PIPE_FORMAT_R4A4_UNORM:
                return V_0280A0_SWAP_ALT_REV;
        case PIPE_FORMAT_I8_UNORM:
-       case PIPE_FORMAT_L8_UNORM:
+       case PIPE_FORMAT_I8_SNORM:
        case PIPE_FORMAT_I8_UINT:
        case PIPE_FORMAT_I8_SINT:
+       case PIPE_FORMAT_L8_UNORM:
+       case PIPE_FORMAT_L8_SNORM:
        case PIPE_FORMAT_L8_UINT:
        case PIPE_FORMAT_L8_SINT:
        case PIPE_FORMAT_L8_SRGB:
+       case PIPE_FORMAT_L16_UNORM:
+       case PIPE_FORMAT_L16_SNORM:
+       case PIPE_FORMAT_L16_UINT:
+       case PIPE_FORMAT_L16_SINT:
+       case PIPE_FORMAT_L16_FLOAT:
+       case PIPE_FORMAT_L32_UINT:
+       case PIPE_FORMAT_L32_SINT:
+       case PIPE_FORMAT_L32_FLOAT:
+       case PIPE_FORMAT_I16_UNORM:
+       case PIPE_FORMAT_I16_SNORM:
+       case PIPE_FORMAT_I16_UINT:
+       case PIPE_FORMAT_I16_SINT:
+       case PIPE_FORMAT_I16_FLOAT:
+       case PIPE_FORMAT_I32_UINT:
+       case PIPE_FORMAT_I32_SINT:
+       case PIPE_FORMAT_I32_FLOAT:
        case PIPE_FORMAT_R8_UNORM:
        case PIPE_FORMAT_R8_SNORM:
        case PIPE_FORMAT_R8_UINT:
@@ -193,16 +206,27 @@ static uint32_t r600_translate_colorswap(enum pipe_format format)
                return V_0280A0_SWAP_STD;
 
        case PIPE_FORMAT_L8A8_UNORM:
+       case PIPE_FORMAT_L8A8_SNORM:
        case PIPE_FORMAT_L8A8_UINT:
        case PIPE_FORMAT_L8A8_SINT:
        case PIPE_FORMAT_L8A8_SRGB:
+       case PIPE_FORMAT_L16A16_UNORM:
+       case PIPE_FORMAT_L16A16_SNORM:
+       case PIPE_FORMAT_L16A16_UINT:
+       case PIPE_FORMAT_L16A16_SINT:
+       case PIPE_FORMAT_L16A16_FLOAT:
+       case PIPE_FORMAT_L32A32_UINT:
+       case PIPE_FORMAT_L32A32_SINT:
+       case PIPE_FORMAT_L32A32_FLOAT:
                return V_0280A0_SWAP_ALT;
        case PIPE_FORMAT_R8G8_UNORM:
+       case PIPE_FORMAT_R8G8_SNORM:
        case PIPE_FORMAT_R8G8_UINT:
        case PIPE_FORMAT_R8G8_SINT:
                return V_0280A0_SWAP_STD;
 
        case PIPE_FORMAT_R16_UNORM:
+       case PIPE_FORMAT_R16_SNORM:
        case PIPE_FORMAT_R16_UINT:
        case PIPE_FORMAT_R16_SINT:
        case PIPE_FORMAT_R16_FLOAT:
@@ -225,8 +249,6 @@ static uint32_t r600_translate_colorswap(enum pipe_format format)
        case PIPE_FORMAT_R8G8B8A8_SNORM:
        case PIPE_FORMAT_R8G8B8A8_UNORM:
        case PIPE_FORMAT_R8G8B8X8_UNORM:
-       case PIPE_FORMAT_R8G8B8A8_SSCALED:
-       case PIPE_FORMAT_R8G8B8A8_USCALED:
        case PIPE_FORMAT_R8G8B8A8_SINT:
        case PIPE_FORMAT_R8G8B8A8_UINT:
                return V_0280A0_SWAP_STD;
@@ -255,6 +277,7 @@ static uint32_t r600_translate_colorswap(enum pipe_format format)
 
        case PIPE_FORMAT_R11G11B10_FLOAT:
        case PIPE_FORMAT_R16G16_UNORM:
+       case PIPE_FORMAT_R16G16_SNORM:
        case PIPE_FORMAT_R16G16_FLOAT:
        case PIPE_FORMAT_R16G16_UINT:
        case PIPE_FORMAT_R16G16_SINT:
@@ -270,8 +293,6 @@ static uint32_t r600_translate_colorswap(enum pipe_format format)
        case PIPE_FORMAT_R32G32_SINT:
        case PIPE_FORMAT_R16G16B16A16_UNORM:
        case PIPE_FORMAT_R16G16B16A16_SNORM:
-       case PIPE_FORMAT_R16G16B16A16_USCALED:
-       case PIPE_FORMAT_R16G16B16A16_SSCALED:
        case PIPE_FORMAT_R16G16B16A16_UINT:
        case PIPE_FORMAT_R16G16B16A16_SINT:
        case PIPE_FORMAT_R16G16B16A16_FLOAT:
@@ -281,8 +302,6 @@ static uint32_t r600_translate_colorswap(enum pipe_format format)
        case PIPE_FORMAT_R32G32B32A32_FLOAT:
        case PIPE_FORMAT_R32G32B32A32_SNORM:
        case PIPE_FORMAT_R32G32B32A32_UNORM:
-       case PIPE_FORMAT_R32G32B32A32_USCALED:
-       case PIPE_FORMAT_R32G32B32A32_SSCALED:
        case PIPE_FORMAT_R32G32B32A32_SINT:
        case PIPE_FORMAT_R32G32B32A32_UINT:
                return V_0280A0_SWAP_STD;
@@ -303,12 +322,15 @@ static uint32_t r600_translate_colorformat(enum pipe_format format)
 
        /* 8-bit buffers. */
        case PIPE_FORMAT_A8_UNORM:
+       case PIPE_FORMAT_A8_SNORM:
        case PIPE_FORMAT_A8_UINT:
        case PIPE_FORMAT_A8_SINT:
        case PIPE_FORMAT_I8_UNORM:
+       case PIPE_FORMAT_I8_SNORM:
        case PIPE_FORMAT_I8_UINT:
        case PIPE_FORMAT_I8_SINT:
        case PIPE_FORMAT_L8_UNORM:
+       case PIPE_FORMAT_L8_SNORM:
        case PIPE_FORMAT_L8_UINT:
        case PIPE_FORMAT_L8_SINT:
        case PIPE_FORMAT_L8_SRGB:
@@ -334,20 +356,38 @@ static uint32_t r600_translate_colorformat(enum pipe_format format)
                return V_0280A0_COLOR_16;
 
        case PIPE_FORMAT_L8A8_UNORM:
+       case PIPE_FORMAT_L8A8_SNORM:
        case PIPE_FORMAT_L8A8_UINT:
        case PIPE_FORMAT_L8A8_SINT:
        case PIPE_FORMAT_L8A8_SRGB:
        case PIPE_FORMAT_R8G8_UNORM:
+       case PIPE_FORMAT_R8G8_SNORM:
        case PIPE_FORMAT_R8G8_UINT:
        case PIPE_FORMAT_R8G8_SINT:
                return V_0280A0_COLOR_8_8;
 
        case PIPE_FORMAT_R16_UNORM:
+       case PIPE_FORMAT_R16_SNORM:
        case PIPE_FORMAT_R16_UINT:
        case PIPE_FORMAT_R16_SINT:
+       case PIPE_FORMAT_A16_UNORM:
+       case PIPE_FORMAT_A16_SNORM:
+       case PIPE_FORMAT_A16_UINT:
+       case PIPE_FORMAT_A16_SINT:
+       case PIPE_FORMAT_L16_UNORM:
+       case PIPE_FORMAT_L16_SNORM:
+       case PIPE_FORMAT_L16_UINT:
+       case PIPE_FORMAT_L16_SINT:
+       case PIPE_FORMAT_I16_UNORM:
+       case PIPE_FORMAT_I16_SNORM:
+       case PIPE_FORMAT_I16_UINT:
+       case PIPE_FORMAT_I16_SINT:
                return V_0280A0_COLOR_16;
 
        case PIPE_FORMAT_R16_FLOAT:
+       case PIPE_FORMAT_A16_FLOAT:
+       case PIPE_FORMAT_L16_FLOAT:
+       case PIPE_FORMAT_I16_FLOAT:
                return V_0280A0_COLOR_16_FLOAT;
 
        /* 32-bit buffers. */
@@ -359,8 +399,6 @@ static uint32_t r600_translate_colorformat(enum pipe_format format)
        case PIPE_FORMAT_B8G8R8X8_UNORM:
        case PIPE_FORMAT_R8G8B8A8_SNORM:
        case PIPE_FORMAT_R8G8B8A8_UNORM:
-       case PIPE_FORMAT_R8G8B8A8_SSCALED:
-       case PIPE_FORMAT_R8G8B8A8_USCALED:
        case PIPE_FORMAT_R8G8B8X8_UNORM:
        case PIPE_FORMAT_R8SG8SB8UX8U_NORM:
        case PIPE_FORMAT_X8B8G8R8_UNORM:
@@ -390,31 +428,41 @@ static uint32_t r600_translate_colorformat(enum pipe_format format)
 
        case PIPE_FORMAT_R32_UINT:
        case PIPE_FORMAT_R32_SINT:
+       case PIPE_FORMAT_A32_UINT:
+       case PIPE_FORMAT_A32_SINT:
+       case PIPE_FORMAT_L32_UINT:
+       case PIPE_FORMAT_L32_SINT:
+       case PIPE_FORMAT_I32_UINT:
+       case PIPE_FORMAT_I32_SINT:
                return V_0280A0_COLOR_32;
 
        case PIPE_FORMAT_R32_FLOAT:
+       case PIPE_FORMAT_A32_FLOAT:
+       case PIPE_FORMAT_L32_FLOAT:
+       case PIPE_FORMAT_I32_FLOAT:
        case PIPE_FORMAT_Z32_FLOAT:
                return V_0280A0_COLOR_32_FLOAT;
 
        case PIPE_FORMAT_R16G16_FLOAT:
+       case PIPE_FORMAT_L16A16_FLOAT:
                return V_0280A0_COLOR_16_16_FLOAT;
 
-       case PIPE_FORMAT_R16G16_SSCALED:
        case PIPE_FORMAT_R16G16_UNORM:
+       case PIPE_FORMAT_R16G16_SNORM:
        case PIPE_FORMAT_R16G16_UINT:
        case PIPE_FORMAT_R16G16_SINT:
+       case PIPE_FORMAT_L16A16_UNORM:
+       case PIPE_FORMAT_L16A16_SNORM:
+       case PIPE_FORMAT_L16A16_UINT:
+       case PIPE_FORMAT_L16A16_SINT:
                return V_0280A0_COLOR_16_16;
 
        case PIPE_FORMAT_R11G11B10_FLOAT:
                return V_0280A0_COLOR_10_11_11_FLOAT;
 
        /* 64-bit buffers. */
-       case PIPE_FORMAT_R16G16B16_USCALED:
-       case PIPE_FORMAT_R16G16B16A16_USCALED:
-       case PIPE_FORMAT_R16G16B16_SSCALED:
        case PIPE_FORMAT_R16G16B16A16_UINT:
        case PIPE_FORMAT_R16G16B16A16_SINT:
-       case PIPE_FORMAT_R16G16B16A16_SSCALED:
        case PIPE_FORMAT_R16G16B16A16_UNORM:
        case PIPE_FORMAT_R16G16B16A16_SNORM:
                return V_0280A0_COLOR_16_16_16_16;
@@ -424,12 +472,13 @@ static uint32_t r600_translate_colorformat(enum pipe_format format)
                return V_0280A0_COLOR_16_16_16_16_FLOAT;
 
        case PIPE_FORMAT_R32G32_FLOAT:
+       case PIPE_FORMAT_L32A32_FLOAT:
                return V_0280A0_COLOR_32_32_FLOAT;
 
-       case PIPE_FORMAT_R32G32_USCALED:
-       case PIPE_FORMAT_R32G32_SSCALED:
        case PIPE_FORMAT_R32G32_SINT:
        case PIPE_FORMAT_R32G32_UINT:
+       case PIPE_FORMAT_L32A32_UINT:
+       case PIPE_FORMAT_L32A32_SINT:
                return V_0280A0_COLOR_32_32;
 
        /* 96-bit buffers. */
@@ -441,8 +490,6 @@ static uint32_t r600_translate_colorformat(enum pipe_format format)
                return V_0280A0_COLOR_32_32_32_32_FLOAT;
        case PIPE_FORMAT_R32G32B32A32_SNORM:
        case PIPE_FORMAT_R32G32B32A32_UNORM:
-       case PIPE_FORMAT_R32G32B32A32_SSCALED:
-       case PIPE_FORMAT_R32G32B32A32_USCALED:
        case PIPE_FORMAT_R32G32B32A32_SINT:
        case PIPE_FORMAT_R32G32B32A32_UINT:
                return V_0280A0_COLOR_32_32_32_32;
@@ -611,19 +658,19 @@ void r600_polygon_offset_update(struct r600_context *rctx)
                offset_db_fmt_cntl |= S_028DF8_POLY_OFFSET_NEG_NUM_DB_BITS(depth);
                r600_pipe_state_add_reg(&state,
                                R_028E00_PA_SU_POLY_OFFSET_FRONT_SCALE,
-                               fui(rctx->rasterizer->offset_scale), NULL, 0);
+                               fui(rctx->rasterizer->offset_scale));
                r600_pipe_state_add_reg(&state,
                                R_028E04_PA_SU_POLY_OFFSET_FRONT_OFFSET,
-                               fui(offset_units), NULL, 0);
+                               fui(offset_units));
                r600_pipe_state_add_reg(&state,
                                R_028E08_PA_SU_POLY_OFFSET_BACK_SCALE,
-                               fui(rctx->rasterizer->offset_scale), NULL, 0);
+                               fui(rctx->rasterizer->offset_scale));
                r600_pipe_state_add_reg(&state,
                                R_028E0C_PA_SU_POLY_OFFSET_BACK_OFFSET,
-                               fui(offset_units), NULL, 0);
+                               fui(offset_units));
                r600_pipe_state_add_reg(&state,
                                R_028DF8_PA_SU_POLY_OFFSET_DB_FMT_CNTL,
-                               offset_db_fmt_cntl, NULL, 0);
+                               offset_db_fmt_cntl);
                r600_context_pipe_state_set(rctx, &state);
        }
 }
@@ -671,7 +718,8 @@ static void *r600_create_blend_state(struct pipe_context *ctx,
        }
        blend->cb_target_mask = target_mask;
        blend->cb_color_control = color_control;
-
+       /* only MRT0 has dual src blend */
+       blend->dual_src_blend = util_blend_state_is_dual(state, 0);
        for (int i = 0; i < 8; i++) {
                /* state->rt entries > 0 only written if independent blending */
                const int j = state->independent_blend_enable ? i : 0;
@@ -701,9 +749,9 @@ static void *r600_create_blend_state(struct pipe_context *ctx,
 
                /* R600 does not support per-MRT blends */
                if (rctx->family > CHIP_R600)
-                       r600_pipe_state_add_reg(rstate, R_028780_CB_BLEND0_CONTROL + i * 4, bc, NULL, 0);
+                       r600_pipe_state_add_reg(rstate, R_028780_CB_BLEND0_CONTROL + i * 4, bc);
                if (i == 0)
-                       r600_pipe_state_add_reg(rstate, R_028804_CB_BLEND_CONTROL, bc, NULL, 0);
+                       r600_pipe_state_add_reg(rstate, R_028804_CB_BLEND_CONTROL, bc);
        }
        return rstate;
 }
@@ -759,8 +807,8 @@ static void *r600_create_dsa_state(struct pipe_context *ctx,
        }
        dsa->alpha_ref = alpha_ref;
 
-       r600_pipe_state_add_reg(rstate, R_028410_SX_ALPHA_TEST_CONTROL, alpha_test_control, NULL, 0);
-       r600_pipe_state_add_reg(rstate, R_028800_DB_DEPTH_CONTROL, db_depth_control, NULL, 0);
+       r600_pipe_state_add_reg(rstate, R_028410_SX_ALPHA_TEST_CONTROL, alpha_test_control);
+       r600_pipe_state_add_reg(rstate, R_028800_DB_DEPTH_CONTROL, db_depth_control);
        return rstate;
 }
 
@@ -815,18 +863,13 @@ static void *r600_create_rs_state(struct pipe_context *ctx,
                        tmp |= S_0286D4_PNT_SPRITE_TOP_1(1);
                }
        }
-       r600_pipe_state_add_reg(rstate, R_0286D4_SPI_INTERP_CONTROL_0, tmp, NULL, 0);
+       r600_pipe_state_add_reg(rstate, R_0286D4_SPI_INTERP_CONTROL_0, tmp);
 
        /* point size 12.4 fixed point */
-       /* For rasterizer discard, disable point rendering by forcing the point size to be 0. */
-       tmp = state->rasterizer_discard ? 0 : r600_pack_float_12p4(state->point_size/2);
-       r600_pipe_state_add_reg(rstate, R_028A00_PA_SU_POINT_SIZE, S_028A00_HEIGHT(tmp) | S_028A00_WIDTH(tmp), NULL, 0);
-
-       if (state->rasterizer_discard) {
-               /* For rasterizer discard, disable point rendering by forcing the point size to be 0. */
-               psize_min = 0;
-               psize_max = 0;
-       } else if (state->point_size_per_vertex) {
+       tmp = r600_pack_float_12p4(state->point_size/2);
+       r600_pipe_state_add_reg(rstate, R_028A00_PA_SU_POINT_SIZE, S_028A00_HEIGHT(tmp) | S_028A00_WIDTH(tmp));
+
+       if (state->point_size_per_vertex) {
                psize_min = util_get_min_point_size(state);
                psize_max = 8192;
        } else {
@@ -837,12 +880,10 @@ static void *r600_create_rs_state(struct pipe_context *ctx,
        /* Divide by two, because 0.5 = 1 pixel. */
        r600_pipe_state_add_reg(rstate, R_028A04_PA_SU_POINT_MINMAX,
                                S_028A04_MIN_SIZE(r600_pack_float_12p4(psize_min/2)) |
-                               S_028A04_MAX_SIZE(r600_pack_float_12p4(psize_max/2)),
-                               NULL, 0);
+                               S_028A04_MAX_SIZE(r600_pack_float_12p4(psize_max/2)));
 
-       /* For rasterizer discard, disable line rendering by forcing the line width to be 0. */
-       tmp = state->rasterizer_discard ? 0 : r600_pack_float_12p4(state->line_width/2);
-       r600_pipe_state_add_reg(rstate, R_028A08_PA_SU_LINE_CNTL, S_028A08_WIDTH(tmp), NULL, 0);
+       tmp = r600_pack_float_12p4(state->line_width/2);
+       r600_pipe_state_add_reg(rstate, R_028A08_PA_SU_LINE_CNTL, S_028A08_WIDTH(tmp));
 
        if (rctx->chip_class >= R700) {
                sc_mode_cntl =
@@ -858,30 +899,24 @@ static void *r600_create_rs_state(struct pipe_context *ctx,
        }
        sc_mode_cntl |= S_028A4C_LINE_STIPPLE_ENABLE(state->line_stipple_enable);
        
-       r600_pipe_state_add_reg(rstate, R_028A4C_PA_SC_MODE_CNTL, sc_mode_cntl,
-                               NULL, 0);
+       r600_pipe_state_add_reg(rstate, R_028A4C_PA_SC_MODE_CNTL, sc_mode_cntl);
 
        r600_pipe_state_add_reg(rstate, R_028C08_PA_SU_VTX_CNTL,
-                               S_028C08_PIX_CENTER_HALF(state->gl_rasterization_rules),
-                               NULL, 0);
+                               S_028C08_PIX_CENTER_HALF(state->gl_rasterization_rules));
 
-       r600_pipe_state_add_reg(rstate, R_028DFC_PA_SU_POLY_OFFSET_CLAMP, fui(state->offset_clamp), NULL, 0);
+       r600_pipe_state_add_reg(rstate, R_028DFC_PA_SU_POLY_OFFSET_CLAMP, fui(state->offset_clamp));
        r600_pipe_state_add_reg(rstate, R_028814_PA_SU_SC_MODE_CNTL,
                                S_028814_PROVOKING_VTX_LAST(prov_vtx) |
-                               S_028814_CULL_FRONT(state->rasterizer_discard || (state->cull_face & PIPE_FACE_FRONT) ? 1 : 0) |
-                               S_028814_CULL_BACK(state->rasterizer_discard || (state->cull_face & PIPE_FACE_BACK) ? 1 : 0) |
+                               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) |
                                S_028814_POLY_MODE(polygon_dual_mode) |
                                S_028814_POLYMODE_FRONT_PTYPE(r600_translate_fill(state->fill_front)) |
-                               S_028814_POLYMODE_BACK_PTYPE(r600_translate_fill(state->fill_back)),
-                               NULL, 0);
-
-       r600_pipe_state_add_reg(rstate, R_028034_PA_SC_SCREEN_SCISSOR_BR,
-                               state->rasterizer_discard ? 0 : (S_028034_BR_X(8192) | S_028034_BR_Y(8192)),
-                               NULL, 0);
+                               S_028814_POLYMODE_BACK_PTYPE(r600_translate_fill(state->fill_back)));
+       r600_pipe_state_add_reg(rstate, R_028350_SX_MISC, S_028350_MULTIPASS(state->rasterizer_discard));
        return rstate;
 }
 
@@ -1145,8 +1180,7 @@ static void r600_set_seamless_cubemap(struct r600_context *rctx, boolean enable)
                                S_009508_DISABLE_CUBE_ANISO(1) |
                                S_009508_SYNC_GRADIENT(1) |
                                S_009508_SYNC_WALKER(1) |
-                               S_009508_SYNC_ALIGNER(1),
-                               NULL, 0);
+                               S_009508_SYNC_ALIGNER(1));
 
        free(rctx->states[R600_PIPE_STATE_SEAMLESS_CUBEMAP]);
        rctx->states[R600_PIPE_STATE_SEAMLESS_CUBEMAP] = rstate;
@@ -1226,7 +1260,7 @@ static void r600_set_clip_state(struct pipe_context *ctx,
 {
        struct r600_context *rctx = (struct r600_context *)ctx;
        struct r600_pipe_state *rstate = CALLOC_STRUCT(r600_pipe_state);
-       struct pipe_resource * cbuf;
+       struct pipe_constant_buffer cb;
 
        if (rstate == NULL)
                return;
@@ -1236,28 +1270,30 @@ static void r600_set_clip_state(struct pipe_context *ctx,
        for (int i = 0; i < 6; i++) {
                r600_pipe_state_add_reg(rstate,
                                        R_028E20_PA_CL_UCP0_X + i * 16,
-                                       fui(state->ucp[i][0]), NULL, 0);
+                                       fui(state->ucp[i][0]));
                r600_pipe_state_add_reg(rstate,
                                        R_028E24_PA_CL_UCP0_Y + i * 16,
-                                       fui(state->ucp[i][1]) , NULL, 0);
+                                       fui(state->ucp[i][1]) );
                r600_pipe_state_add_reg(rstate,
                                        R_028E28_PA_CL_UCP0_Z + i * 16,
-                                       fui(state->ucp[i][2]), NULL, 0);
+                                       fui(state->ucp[i][2]));
                r600_pipe_state_add_reg(rstate,
                                        R_028E2C_PA_CL_UCP0_W + i * 16,
-                                       fui(state->ucp[i][3]), NULL, 0);
+                                       fui(state->ucp[i][3]));
        }
 
        free(rctx->states[R600_PIPE_STATE_CLIP]);
        rctx->states[R600_PIPE_STATE_CLIP] = rstate;
        r600_context_pipe_state_set(rctx, rstate);
 
-       cbuf = pipe_user_buffer_create(ctx->screen,
-                                   state->ucp,
-                                   4*4*8, /* 8*4 floats */
-                                   PIPE_BIND_CONSTANT_BUFFER);
-       r600_set_constant_buffer(ctx, PIPE_SHADER_VERTEX, 1, cbuf);
-       pipe_resource_reference(&cbuf, NULL);
+       cb.buffer = pipe_user_buffer_create(ctx->screen,
+                                           state->ucp,
+                                           4*4*8, /* 8*4 floats */
+                                           PIPE_BIND_CONSTANT_BUFFER);
+       cb.buffer_offset = 0;
+       cb.buffer_size = 4*4*8;
+       r600_set_constant_buffer(ctx, PIPE_SHADER_VERTEX, 1, &cb);
+       pipe_resource_reference(&cb.buffer, NULL);
 }
 
 static void r600_set_polygon_stipple(struct pipe_context *ctx,
@@ -1282,11 +1318,9 @@ void r600_set_scissor_state(struct r600_context *rctx,
        tl = S_028240_TL_X(state->minx) | S_028240_TL_Y(state->miny) | S_028240_WINDOW_OFFSET_DISABLE(1);
        br = S_028244_BR_X(state->maxx) | S_028244_BR_Y(state->maxy);
        r600_pipe_state_add_reg(rstate,
-                               R_028250_PA_SC_VPORT_SCISSOR_0_TL, tl,
-                               NULL, 0);
+                               R_028250_PA_SC_VPORT_SCISSOR_0_TL, tl);
        r600_pipe_state_add_reg(rstate,
-                               R_028254_PA_SC_VPORT_SCISSOR_0_BR, br,
-                               NULL, 0);
+                               R_028254_PA_SC_VPORT_SCISSOR_0_BR, br);
 
        free(rctx->states[R600_PIPE_STATE_SCISSOR]);
        rctx->states[R600_PIPE_STATE_SCISSOR] = rstate;
@@ -1319,12 +1353,12 @@ static void r600_set_viewport_state(struct pipe_context *ctx,
 
        rctx->viewport = *state;
        rstate->id = R600_PIPE_STATE_VIEWPORT;
-       r600_pipe_state_add_reg(rstate, R_02843C_PA_CL_VPORT_XSCALE_0, fui(state->scale[0]), NULL, 0);
-       r600_pipe_state_add_reg(rstate, R_028444_PA_CL_VPORT_YSCALE_0, fui(state->scale[1]), NULL, 0);
-       r600_pipe_state_add_reg(rstate, R_02844C_PA_CL_VPORT_ZSCALE_0, fui(state->scale[2]), NULL, 0);
-       r600_pipe_state_add_reg(rstate, R_028440_PA_CL_VPORT_XOFFSET_0, fui(state->translate[0]), NULL, 0);
-       r600_pipe_state_add_reg(rstate, R_028448_PA_CL_VPORT_YOFFSET_0, fui(state->translate[1]), NULL, 0);
-       r600_pipe_state_add_reg(rstate, R_028450_PA_CL_VPORT_ZOFFSET_0, fui(state->translate[2]), NULL, 0);
+       r600_pipe_state_add_reg(rstate, R_02843C_PA_CL_VPORT_XSCALE_0, fui(state->scale[0]));
+       r600_pipe_state_add_reg(rstate, R_028444_PA_CL_VPORT_YSCALE_0, fui(state->scale[1]));
+       r600_pipe_state_add_reg(rstate, R_02844C_PA_CL_VPORT_ZSCALE_0, fui(state->scale[2]));
+       r600_pipe_state_add_reg(rstate, R_028440_PA_CL_VPORT_XOFFSET_0, fui(state->translate[0]));
+       r600_pipe_state_add_reg(rstate, R_028448_PA_CL_VPORT_YOFFSET_0, fui(state->translate[1]));
+       r600_pipe_state_add_reg(rstate, R_028450_PA_CL_VPORT_ZOFFSET_0, fui(state->translate[2]));
 
        free(rctx->states[R600_PIPE_STATE_VIEWPORT]);
        rctx->states[R600_PIPE_STATE_VIEWPORT] = rstate;
@@ -1419,7 +1453,7 @@ static void r600_cb(struct r600_context *rctx, struct r600_pipe_state *rstate,
 
        format = r600_translate_colorformat(surf->base.format);
        swap = r600_translate_colorswap(surf->base.format);
-       if(rtex->resource.b.b.b.usage == PIPE_USAGE_STAGING) {
+       if(rtex->resource.b.b.usage == PIPE_USAGE_STAGING) {
                endian = ENDIAN_NONE;
        } else {
                endian = r600_colorformat_endian_swap(format);
@@ -1472,40 +1506,41 @@ static void r600_cb(struct r600_context *rctx, struct r600_pipe_state *rstate,
                        color_info |= S_0280A0_SOURCE_FORMAT(V_0280A0_EXPORT_NORM);
        }
 
-       r600_pipe_state_add_reg(rstate,
+       if (cb == 0)
+               rctx->color0_format = color_info;
+
+       r600_pipe_state_add_reg_bo(rstate,
                                R_028040_CB_COLOR0_BASE + cb * 4,
                                offset >> 8, &rtex->resource, RADEON_USAGE_READWRITE);
-       r600_pipe_state_add_reg(rstate,
+       r600_pipe_state_add_reg_bo(rstate,
                                R_0280A0_CB_COLOR0_INFO + cb * 4,
                                color_info, &rtex->resource, RADEON_USAGE_READWRITE);
        r600_pipe_state_add_reg(rstate,
                                R_028060_CB_COLOR0_SIZE + cb * 4,
                                S_028060_PITCH_TILE_MAX(pitch) |
-                               S_028060_SLICE_TILE_MAX(slice),
-                               NULL, 0);
+                               S_028060_SLICE_TILE_MAX(slice));
        if (!rscreen->use_surface_alloc) {
                r600_pipe_state_add_reg(rstate,
                                        R_028080_CB_COLOR0_VIEW + cb * 4,
-                                       0x00000000, NULL, 0);
+                                       0x00000000);
        } else {
                if (rtex->surface.level[level].mode < RADEON_SURF_MODE_1D) {
                        r600_pipe_state_add_reg(rstate,
                                                R_028080_CB_COLOR0_VIEW + cb * 4,
-                                               0x00000000, NULL, 0);
+                                               0x00000000);
                } else {
                        r600_pipe_state_add_reg(rstate,
                                                R_028080_CB_COLOR0_VIEW + cb * 4,
                                                S_028080_SLICE_START(state->cbufs[cb]->u.tex.first_layer) |
-                                               S_028080_SLICE_MAX(state->cbufs[cb]->u.tex.last_layer),
-                                               NULL, 0);
+                                               S_028080_SLICE_MAX(state->cbufs[cb]->u.tex.last_layer));
                }
        }
-       r600_pipe_state_add_reg(rstate,
-                               R_0280E0_CB_COLOR0_FRAG + cb * 4,
-                               0, &rtex->resource, RADEON_USAGE_READWRITE);
-       r600_pipe_state_add_reg(rstate,
-                               R_0280C0_CB_COLOR0_TILE + cb * 4,
-                               0, &rtex->resource, RADEON_USAGE_READWRITE);
+       r600_pipe_state_add_reg_bo(rstate,
+                                  R_0280E0_CB_COLOR0_FRAG + cb * 4,
+                                  0, &rtex->resource, RADEON_USAGE_READWRITE);
+       r600_pipe_state_add_reg_bo(rstate,
+                                  R_0280C0_CB_COLOR0_TILE + cb * 4,
+                                  0, &rtex->resource, RADEON_USAGE_READWRITE);
 }
 
 static void r600_db(struct r600_context *rctx, struct r600_pipe_state *rstate,
@@ -1559,24 +1594,22 @@ static void r600_db(struct r600_context *rctx, struct r600_pipe_state *rstate,
 
        format = r600_translate_dbformat(state->zsbuf->texture->format);
 
-       r600_pipe_state_add_reg(rstate, R_02800C_DB_DEPTH_BASE,
+       r600_pipe_state_add_reg_bo(rstate, R_02800C_DB_DEPTH_BASE,
                                offset >> 8, &rtex->resource, RADEON_USAGE_READWRITE);
        r600_pipe_state_add_reg(rstate, R_028000_DB_DEPTH_SIZE,
-                               S_028000_PITCH_TILE_MAX(pitch) | S_028000_SLICE_TILE_MAX(slice),
-                               NULL, 0);
+                               S_028000_PITCH_TILE_MAX(pitch) | S_028000_SLICE_TILE_MAX(slice));
        if (!rscreen->use_surface_alloc) {
-               r600_pipe_state_add_reg(rstate, R_028004_DB_DEPTH_VIEW, 0x00000000, NULL, 0);
+               r600_pipe_state_add_reg(rstate, R_028004_DB_DEPTH_VIEW, 0x00000000);
        } else {
                r600_pipe_state_add_reg(rstate, R_028004_DB_DEPTH_VIEW,
                                        S_028004_SLICE_START(state->zsbuf->u.tex.first_layer) |
-                                       S_028004_SLICE_MAX(state->zsbuf->u.tex.last_layer),
-                                       NULL, 0);
+                                       S_028004_SLICE_MAX(state->zsbuf->u.tex.last_layer));
        }
-       r600_pipe_state_add_reg(rstate, R_028010_DB_DEPTH_INFO,
+       r600_pipe_state_add_reg_bo(rstate, R_028010_DB_DEPTH_INFO,
                                S_028010_ARRAY_MODE(array_mode) | S_028010_FORMAT(format),
                                &rtex->resource, RADEON_USAGE_READWRITE);
        r600_pipe_state_add_reg(rstate, R_028D34_DB_PREFETCH_LIMIT,
-                               (surf->aligned_height / 8) - 1, NULL, 0);
+                               (surf->aligned_height / 8) - 1);
 }
 
 static void r600_set_framebuffer_state(struct pipe_context *ctx,
@@ -1584,7 +1617,7 @@ static void r600_set_framebuffer_state(struct pipe_context *ctx,
 {
        struct r600_context *rctx = (struct r600_context *)ctx;
        struct r600_pipe_state *rstate = CALLOC_STRUCT(r600_pipe_state);
-       uint32_t shader_mask, tl, br, shader_control;
+       uint32_t tl, br, shader_control;
 
        if (rstate == NULL)
                return;
@@ -1605,26 +1638,22 @@ static void r600_set_framebuffer_state(struct pipe_context *ctx,
                r600_db(rctx, rstate, state);
        }
 
-       shader_mask = 0;
        shader_control = 0;
+       rctx->fb_cb_shader_mask = 0;
        for (int i = 0; i < state->nr_cbufs; i++) {
-               shader_mask |= 0xf << (i * 4);
                shader_control |= 1 << i;
+               rctx->fb_cb_shader_mask |= 0xf << (i * 4);
        }
        tl = S_028240_TL_X(0) | S_028240_TL_Y(0) | S_028240_WINDOW_OFFSET_DISABLE(1);
        br = S_028244_BR_X(state->width) | S_028244_BR_Y(state->height);
 
        r600_pipe_state_add_reg(rstate,
-                               R_028204_PA_SC_WINDOW_SCISSOR_TL, tl,
-                               NULL, 0);
+                               R_028204_PA_SC_WINDOW_SCISSOR_TL, tl);
        r600_pipe_state_add_reg(rstate,
-                               R_028208_PA_SC_WINDOW_SCISSOR_BR, br,
-                               NULL, 0);
+                               R_028208_PA_SC_WINDOW_SCISSOR_BR, br);
 
        r600_pipe_state_add_reg(rstate, R_0287A0_CB_SHADER_CONTROL,
-                               shader_control, NULL, 0);
-       r600_pipe_state_add_reg(rstate, R_02823C_CB_SHADER_MASK,
-                               shader_mask, NULL, 0);
+                               shader_control);
 
        free(rctx->states[R600_PIPE_STATE_FRAMEBUFFER]);
        rctx->states[R600_PIPE_STATE_FRAMEBUFFER] = rstate;
@@ -1638,7 +1667,7 @@ static void r600_set_framebuffer_state(struct pipe_context *ctx,
 static void r600_emit_db_misc_state(struct r600_context *rctx, struct r600_atom *atom)
 {
        struct radeon_winsys_cs *cs = rctx->cs;
-       struct r600_atom_db_misc_state *a = (struct r600_atom_db_misc_state*)atom;
+       struct r600_db_misc_state *a = (struct r600_db_misc_state*)atom;
        unsigned db_render_control = 0;
        unsigned db_render_override =
                S_028D10_FORCE_HIZ_ENABLE(V_028D10_FORCE_DISABLE) |
@@ -1662,10 +1691,109 @@ static void r600_emit_db_misc_state(struct r600_context *rctx, struct r600_atom
        r600_write_value(cs, db_render_override); /* R_028D10_DB_RENDER_OVERRIDE */
 }
 
+static void r600_emit_vertex_buffers(struct r600_context *rctx, struct r600_atom *atom)
+{
+       struct radeon_winsys_cs *cs = rctx->cs;
+       struct pipe_vertex_buffer *vb = rctx->vertex_buffer;
+       unsigned count = rctx->nr_vertex_buffers;
+       unsigned i, offset;
+
+       for (i = 0; i < count; i++) {
+               struct r600_resource *rbuffer = (struct r600_resource*)vb[i].buffer;
+
+               if (!rbuffer) {
+                       continue;
+               }
+
+               offset = vb[i].buffer_offset;
+
+               /* fetch resources start at index 320 */
+               r600_write_value(cs, PKT3(PKT3_SET_RESOURCE, 7, 0));
+               r600_write_value(cs, (320 + i) * 7);
+               r600_write_value(cs, offset); /* RESOURCEi_WORD0 */
+               r600_write_value(cs, rbuffer->buf->size - offset - 1); /* RESOURCEi_WORD1 */
+               r600_write_value(cs, /* RESOURCEi_WORD2 */
+                                S_038008_ENDIAN_SWAP(r600_endian_swap(32)) |
+                                S_038008_STRIDE(vb[i].stride));
+               r600_write_value(cs, 0); /* RESOURCEi_WORD3 */
+               r600_write_value(cs, 0); /* RESOURCEi_WORD4 */
+               r600_write_value(cs, 0); /* RESOURCEi_WORD5 */
+               r600_write_value(cs, 0xc0000000); /* RESOURCEi_WORD6 */
+
+               r600_write_value(cs, PKT3(PKT3_NOP, 0, 0));
+               r600_write_value(cs, r600_context_bo_reloc(rctx, rbuffer, RADEON_USAGE_READ));
+       }
+}
+
+static void r600_emit_constant_buffers(struct r600_context *rctx,
+                                      struct r600_constbuf_state *state,
+                                      unsigned buffer_id_base,
+                                      unsigned reg_alu_constbuf_size,
+                                      unsigned reg_alu_const_cache)
+{
+       struct radeon_winsys_cs *cs = rctx->cs;
+       uint32_t dirty_mask = state->dirty_mask;
+
+       while (dirty_mask) {
+               struct pipe_constant_buffer *cb;
+               struct r600_resource *rbuffer;
+               unsigned offset;
+               unsigned buffer_index = ffs(dirty_mask) - 1;
+
+               cb = &state->cb[buffer_index];
+               rbuffer = (struct r600_resource*)cb->buffer;
+               assert(rbuffer);
+
+               offset = cb->buffer_offset;
+
+               r600_write_context_reg(cs, reg_alu_constbuf_size + buffer_index * 4,
+                                      ALIGN_DIVUP(cb->buffer_size >> 4, 16));
+               r600_write_context_reg(cs, reg_alu_const_cache + buffer_index * 4, offset >> 8);
+
+               r600_write_value(cs, PKT3(PKT3_NOP, 0, 0));
+               r600_write_value(cs, r600_context_bo_reloc(rctx, rbuffer, RADEON_USAGE_READ));
+
+               r600_write_value(cs, PKT3(PKT3_SET_RESOURCE, 7, 0));
+               r600_write_value(cs, (buffer_id_base + buffer_index) * 7);
+               r600_write_value(cs, offset); /* RESOURCEi_WORD0 */
+               r600_write_value(cs, rbuffer->buf->size - offset - 1); /* RESOURCEi_WORD1 */
+               r600_write_value(cs, /* RESOURCEi_WORD2 */
+                                S_038008_ENDIAN_SWAP(r600_endian_swap(32)) |
+                                S_038008_STRIDE(16));
+               r600_write_value(cs, 0); /* RESOURCEi_WORD3 */
+               r600_write_value(cs, 0); /* RESOURCEi_WORD4 */
+               r600_write_value(cs, 0); /* RESOURCEi_WORD5 */
+               r600_write_value(cs, 0xc0000000); /* RESOURCEi_WORD6 */
+
+               r600_write_value(cs, PKT3(PKT3_NOP, 0, 0));
+               r600_write_value(cs, r600_context_bo_reloc(rctx, rbuffer, RADEON_USAGE_READ));
+
+               dirty_mask &= ~(1 << buffer_index);
+       }
+       state->dirty_mask = 0;
+}
+
+static void r600_emit_vs_constant_buffer(struct r600_context *rctx, struct r600_atom *atom)
+{
+       r600_emit_constant_buffers(rctx, &rctx->vs_constbuf_state, 160,
+                                  R_028180_ALU_CONST_BUFFER_SIZE_VS_0,
+                                  R_028980_ALU_CONST_CACHE_VS_0);
+}
+
+static void r600_emit_ps_constant_buffer(struct r600_context *rctx, struct r600_atom *atom)
+{
+       r600_emit_constant_buffers(rctx, &rctx->ps_constbuf_state, 0,
+                                  R_028140_ALU_CONST_BUFFER_SIZE_PS_0,
+                                  R_028940_ALU_CONST_CACHE_PS_0);
+}
+
 void r600_init_state_functions(struct r600_context *rctx)
 {
-       r600_init_atom(&rctx->atom_db_misc_state.atom, r600_emit_db_misc_state, 4, 0);
-       r600_atom_dirty(rctx, &rctx->atom_db_misc_state.atom);
+       r600_init_atom(&rctx->db_misc_state.atom, r600_emit_db_misc_state, 4, 0);
+       r600_atom_dirty(rctx, &rctx->db_misc_state.atom);
+       r600_init_atom(&rctx->vertex_buffer_state, r600_emit_vertex_buffers, 0, 0);
+       r600_init_atom(&rctx->vs_constbuf_state.atom, r600_emit_vs_constant_buffer, 0, 0);
+       r600_init_atom(&rctx->ps_constbuf_state.atom, r600_emit_ps_constant_buffer, 0, 0);
 
        rctx->context.create_blend_state = r600_create_blend_state;
        rctx->context.create_depth_stencil_alpha_state = r600_create_dsa_state;
@@ -1744,7 +1872,7 @@ void r600_adjust_gprs(struct r600_context *rctx)
        tmp |= S_008C04_NUM_VS_GPRS(num_vs_gprs);
        tmp |= S_008C04_NUM_CLAUSE_TEMP_GPRS(rctx->r6xx_num_clause_temp_gprs);
        rstate.nregs = 0;
-       r600_pipe_state_add_reg(&rstate, R_008C04_SQ_GPR_RESOURCE_MGMT_1, tmp, NULL, 0);
+       r600_pipe_state_add_reg(&rstate, R_008C04_SQ_GPR_RESOURCE_MGMT_1, tmp);
 
        r600_context_pipe_state_set(rctx, &rstate);
 }
@@ -1769,7 +1897,7 @@ void r600_init_atom_start_cs(struct r600_context *rctx)
        int num_gs_stack_entries;
        int num_es_stack_entries;
        enum radeon_family family;
-       struct r600_command_buffer *cb = &rctx->atom_start_cs;
+       struct r600_command_buffer *cb = &rctx->start_cs_cmd;
        uint32_t tmp;
        unsigned i;
 
@@ -1954,8 +2082,6 @@ void r600_init_atom_start_cs(struct r600_context *rctx)
 
        r600_store_config_reg(cb, R_009714_VC_ENHANCE, 0);
 
-       r600_store_context_reg(cb, R_028350_SX_MISC, 0);
-
        if (rctx->chip_class >= R700) {
                r600_store_config_reg(cb, R_008D8C_SQ_DYN_GPR_CNTL_PS_FLUSH_REQ, 0x00004000);
                r600_store_config_reg(cb, R_009830_DB_DEBUG, 0);
@@ -2066,7 +2192,9 @@ void r600_init_atom_start_cs(struct r600_context *rctx)
 
        r600_store_context_reg(cb, R_028C48_PA_SC_AA_MASK, 0xFFFFFFFF);
 
-       r600_store_context_reg(cb, R_028030_PA_SC_SCREEN_SCISSOR_TL, 0);
+       r600_store_context_reg_seq(cb, R_028030_PA_SC_SCREEN_SCISSOR_TL, 2);
+       r600_store_value(cb, 0); /* R_028030_PA_SC_SCREEN_SCISSOR_TL */
+       r600_store_value(cb, S_028034_BR_X(8192) | S_028034_BR_Y(8192)); /* R_028034_PA_SC_SCREEN_SCISSOR_BR */
 
        r600_store_context_reg_seq(cb, R_028240_PA_SC_GENERIC_SCISSOR_TL, 2);
        r600_store_value(cb, 0); /* R_028240_PA_SC_GENERIC_SCISSOR_TL */
@@ -2079,6 +2207,10 @@ void r600_init_atom_start_cs(struct r600_context *rctx)
        r600_store_context_reg(cb, R_0288A4_SQ_PGM_RESOURCES_FS, 0);
        r600_store_context_reg(cb, R_0288DC_SQ_PGM_CF_OFFSET_FS, 0);
 
+       if (rctx->chip_class == R700 && rctx->screen->info.r600_has_streamout)
+               r600_store_context_reg(cb, R_028354_SX_SURFACE_SYNC, S_028354_SURFACE_SYNC_MASK(0xf));
+       r600_store_context_reg(cb, R_028800_DB_DEPTH_CONTROL, 0);
+
        r600_store_loop_const(cb, R_03E200_SQ_LOOP_CONST_0, 0x1000FFF);
        r600_store_loop_const(cb, R_03E200_SQ_LOOP_CONST_0 + (32 * 4), 0x1000FFF);
 }
@@ -2125,7 +2257,7 @@ void r600_pipe_shader_ps(struct pipe_context *ctx, struct r600_pipe_shader *shad
                }
 
                r600_pipe_state_add_reg(rstate, R_028644_SPI_PS_INPUT_CNTL_0 + i * 4,
-                               tmp, NULL, 0);
+                               tmp);
        }
 
        db_shader_control = S_02880C_Z_ORDER(V_02880C_EARLY_Z_THEN_LATE_Z);
@@ -2154,6 +2286,8 @@ void r600_pipe_shader_ps(struct pipe_context *ctx, struct r600_pipe_shader *shad
                exports_ps = 2;
        }
 
+       shader->ps_cb_shader_mask = (1ULL << ((unsigned)num_cout * 4)) - 1;
+
        spi_ps_in_control_0 = S_0286CC_NUM_INTERP(rshader->ninput) |
                                S_0286CC_PERSP_GRADIENT_ENA(1)|
                                S_0286CC_LINEAR_GRADIENT_ENA(need_linear);
@@ -2176,25 +2310,23 @@ void r600_pipe_shader_ps(struct pipe_context *ctx, struct r600_pipe_shader *shad
        if (rctx->family == CHIP_R600)
                ufi = 1;
 
-       r600_pipe_state_add_reg(rstate, R_0286CC_SPI_PS_IN_CONTROL_0, spi_ps_in_control_0, NULL, 0);
-       r600_pipe_state_add_reg(rstate, R_0286D0_SPI_PS_IN_CONTROL_1, spi_ps_in_control_1, NULL, 0);
-       r600_pipe_state_add_reg(rstate, R_0286D8_SPI_INPUT_Z, spi_input_z, NULL, 0);
-       r600_pipe_state_add_reg(rstate,
-                               R_028840_SQ_PGM_START_PS,
-                               0, shader->bo, RADEON_USAGE_READ);
+       r600_pipe_state_add_reg(rstate, R_0286CC_SPI_PS_IN_CONTROL_0, spi_ps_in_control_0);
+       r600_pipe_state_add_reg(rstate, R_0286D0_SPI_PS_IN_CONTROL_1, spi_ps_in_control_1);
+       r600_pipe_state_add_reg(rstate, R_0286D8_SPI_INPUT_Z, spi_input_z);
+       r600_pipe_state_add_reg_bo(rstate,
+                                  R_028840_SQ_PGM_START_PS,
+                                  0, shader->bo, RADEON_USAGE_READ);
        r600_pipe_state_add_reg(rstate,
                                R_028850_SQ_PGM_RESOURCES_PS,
                                S_028850_NUM_GPRS(rshader->bc.ngpr) |
                                S_028850_STACK_SIZE(rshader->bc.nstack) |
-                               S_028850_UNCACHED_FIRST_INST(ufi),
-                               NULL, 0);
+                               S_028850_UNCACHED_FIRST_INST(ufi));
        r600_pipe_state_add_reg(rstate,
                                R_028854_SQ_PGM_EXPORTS_PS,
-                               exports_ps, NULL, 0);
+                               exports_ps);
        /* only set some bits here, the other bits are set in the dsa state */
        r600_pipe_state_add_reg(rstate, R_02880C_DB_SHADER_CONTROL,
-                               db_shader_control,
-                               NULL, 0);
+                               db_shader_control);
 
        shader->sprite_coord_enable = rctx->sprite_coord_enable;
        if (rctx->rasterizer)
@@ -2223,7 +2355,7 @@ void r600_pipe_shader_vs(struct pipe_context *ctx, struct r600_pipe_shader *shad
        for (i = 0; i < 10; i++) {
                r600_pipe_state_add_reg(rstate,
                                        R_028614_SPI_VS_OUT_ID_0 + i * 4,
-                                       spi_vs_out_id[i], NULL, 0);
+                                       spi_vs_out_id[i]);
        }
 
        /* Certain attributes (position, psize, etc.) don't count as params.
@@ -2234,15 +2366,13 @@ void r600_pipe_shader_vs(struct pipe_context *ctx, struct r600_pipe_shader *shad
                nparams = 1;
 
        r600_pipe_state_add_reg(rstate,
-                       R_0286C4_SPI_VS_OUT_CONFIG,
-                       S_0286C4_VS_EXPORT_COUNT(nparams - 1),
-                       NULL, 0);
-       r600_pipe_state_add_reg(rstate,
-                       R_028868_SQ_PGM_RESOURCES_VS,
-                       S_028868_NUM_GPRS(rshader->bc.ngpr) |
-                       S_028868_STACK_SIZE(rshader->bc.nstack),
-                       NULL, 0);
+                               R_0286C4_SPI_VS_OUT_CONFIG,
+                               S_0286C4_VS_EXPORT_COUNT(nparams - 1));
        r600_pipe_state_add_reg(rstate,
+                               R_028868_SQ_PGM_RESOURCES_VS,
+                               S_028868_NUM_GPRS(rshader->bc.ngpr) |
+                               S_028868_STACK_SIZE(rshader->bc.nstack));
+       r600_pipe_state_add_reg_bo(rstate,
                        R_028858_SQ_PGM_START_VS,
                        0, shader->bo, RADEON_USAGE_READ);
 
@@ -2262,7 +2392,7 @@ void r600_fetch_shader(struct pipe_context *ctx,
        rstate = &ve->rstate;
        rstate->id = R600_PIPE_STATE_FETCH_SHADER;
        rstate->nregs = 0;
-       r600_pipe_state_add_reg(rstate, R_028894_SQ_PGM_START_FS,
+       r600_pipe_state_add_reg_bo(rstate, R_028894_SQ_PGM_START_FS,
                                0,
                                ve->fetch_shader, RADEON_USAGE_READ);
 }
@@ -2295,31 +2425,3 @@ void *r600_create_db_flush_dsa(struct r600_context *rctx)
        dsa_state->is_flush = true;
        return rstate;
 }
-
-void r600_pipe_init_buffer_resource(struct r600_context *rctx,
-                                   struct r600_pipe_resource_state *rstate)
-{
-       rstate->id = R600_PIPE_STATE_RESOURCE;
-
-       rstate->bo[0] = NULL;
-       rstate->val[0] = 0;
-       rstate->val[1] = 0;
-       rstate->val[2] = 0;
-       rstate->val[3] = 0;
-       rstate->val[4] = 0;
-       rstate->val[5] = 0;
-       rstate->val[6] = 0xc0000000;
-}
-
-void r600_pipe_mod_buffer_resource(struct r600_pipe_resource_state *rstate,
-                                  struct r600_resource *rbuffer,
-                                  unsigned offset, unsigned stride,
-                                  enum radeon_bo_usage usage)
-{
-       rstate->val[0] = offset;
-       rstate->bo[0] = rbuffer;
-       rstate->bo_usage[0] = usage;
-       rstate->val[1] = rbuffer->buf->size - offset - 1;
-       rstate->val[2] = S_038008_ENDIAN_SWAP(r600_endian_swap(32)) |
-                        S_038008_STRIDE(stride);
-}