r600/eg: add support for tracing IBs after a hang.
[mesa.git] / src / gallium / drivers / r600 / r600_state_common.c
index 19c61ff44358220e502b27148599f01bbfaa5778..3b24f36119ca68ca650c380555422e2bf7cffad7 100644 (file)
@@ -91,7 +91,7 @@ void r600_emit_alphatest_state(struct r600_context *rctx, struct r600_atom *atom
        radeon_set_context_reg(cs, R_028438_SX_ALPHA_REF, alpha_ref);
 }
 
-static void r600_texture_barrier(struct pipe_context *ctx)
+static void r600_texture_barrier(struct pipe_context *ctx, unsigned flags)
 {
        struct r600_context *rctx = (struct r600_context *)ctx;
 
@@ -99,6 +99,7 @@ static void r600_texture_barrier(struct pipe_context *ctx)
                       R600_CONTEXT_FLUSH_AND_INV_CB |
                       R600_CONTEXT_FLUSH_AND_INV |
                       R600_CONTEXT_WAIT_3D_IDLE;
+       rctx->framebuffer.do_update_surf_dirtiness = true;
 }
 
 static unsigned r600_conv_pipe_prim(unsigned prim)
@@ -121,7 +122,7 @@ static unsigned r600_conv_pipe_prim(unsigned prim)
                [PIPE_PRIM_PATCHES]                     = V_008958_DI_PT_PATCH,
                [R600_PRIM_RECTANGLE_LIST]              = V_008958_DI_PT_RECTLIST
        };
-       assert(prim < Elements(prim_conv));
+       assert(prim < ARRAY_SIZE(prim_conv));
        return prim_conv[prim];
 }
 
@@ -145,7 +146,7 @@ unsigned r600_conv_prim_to_gs_out(unsigned mode)
                [PIPE_PRIM_PATCHES]                     = V_028A6C_OUTPRIM_TYPE_POINTLIST,
                [R600_PRIM_RECTANGLE_LIST]              = V_028A6C_OUTPRIM_TYPE_TRISTRIP
        };
-       assert(mode < Elements(prim_conv));
+       assert(mode < ARRAY_SIZE(prim_conv));
 
        return prim_conv[mode];
 }
@@ -187,6 +188,10 @@ static void r600_bind_blend_state_internal(struct r600_context *rctx,
        if (update_cb) {
                r600_mark_atom_dirty(rctx, &rctx->cb_misc_state.atom);
        }
+       if (rctx->framebuffer.dual_src_blend != blend->dual_src_blend) {
+               rctx->framebuffer.dual_src_blend = blend->dual_src_blend;
+               r600_mark_atom_dirty(rctx, &rctx->framebuffer.atom);
+       }
 }
 
 static void r600_bind_blend_state(struct pipe_context *ctx, void *state)
@@ -350,9 +355,11 @@ static void r600_bind_rs_state(struct pipe_context *ctx, void *state)
 
        if (rs->offset_enable &&
            (rs->offset_units != rctx->poly_offset_state.offset_units ||
-            rs->offset_scale != rctx->poly_offset_state.offset_scale)) {
+            rs->offset_scale != rctx->poly_offset_state.offset_scale ||
+            rs->offset_units_unscaled != rctx->poly_offset_state.offset_units_unscaled)) {
                rctx->poly_offset_state.offset_units = rs->offset_units;
                rctx->poly_offset_state.offset_scale = rs->offset_scale;
+               rctx->poly_offset_state.offset_units_unscaled = rs->offset_units_unscaled;
                r600_mark_atom_dirty(rctx, &rctx->poly_offset_state.atom);
        }
 
@@ -364,7 +371,7 @@ static void r600_bind_rs_state(struct pipe_context *ctx, void *state)
                r600_mark_atom_dirty(rctx, &rctx->clip_misc_state.atom);
        }
 
-       r600_set_scissor_enable(&rctx->b, rs->scissor_enable);
+       r600_viewport_set_rast_deps(&rctx->b, rs->scissor_enable, rs->clip_halfz);
 
        /* Re-emit PA_SC_LINE_STIPPLE. */
        rctx->last_primitive_type = -1;
@@ -406,7 +413,7 @@ void r600_sampler_states_dirty(struct r600_context *rctx,
 }
 
 static void r600_bind_sampler_states(struct pipe_context *pipe,
-                               unsigned shader,
+                              enum pipe_shader_type shader,
                               unsigned start,
                               unsigned count, void **states)
 {
@@ -512,28 +519,13 @@ static void r600_bind_vertex_elements(struct pipe_context *ctx, void *state)
 static void r600_delete_vertex_elements(struct pipe_context *ctx, void *state)
 {
        struct r600_fetch_shader *shader = (struct r600_fetch_shader*)state;
-       pipe_resource_reference((struct pipe_resource**)&shader->buffer, NULL);
+       r600_resource_reference(&shader->buffer, NULL);
        FREE(shader);
 }
 
-static void r600_set_index_buffer(struct pipe_context *ctx,
-                          const struct pipe_index_buffer *ib)
-{
-       struct r600_context *rctx = (struct r600_context *)ctx;
-
-       if (ib) {
-               pipe_resource_reference(&rctx->index_buffer.buffer, ib->buffer);
-               memcpy(&rctx->index_buffer, ib, sizeof(*ib));
-               r600_context_add_resource_size(ctx, ib->buffer);
-       } else {
-               pipe_resource_reference(&rctx->index_buffer.buffer, NULL);
-       }
-}
-
 void r600_vertex_buffers_dirty(struct r600_context *rctx)
 {
        if (rctx->vertex_buffer_state.dirty_mask) {
-               rctx->b.flags |= R600_CONTEXT_INV_VERTEX_CACHE;
                rctx->vertex_buffer_state.atom.num_dw = (rctx->b.chip_class >= EVERGREEN ? 12 : 11) *
                                               util_bitcount(rctx->vertex_buffer_state.dirty_mask);
                r600_mark_atom_dirty(rctx, &rctx->vertex_buffer_state.atom);
@@ -556,21 +548,21 @@ static void r600_set_vertex_buffers(struct pipe_context *ctx,
        if (input) {
                for (i = 0; i < count; i++) {
                        if (memcmp(&input[i], &vb[i], sizeof(struct pipe_vertex_buffer))) {
-                               if (input[i].buffer) {
+                               if (input[i].buffer.resource) {
                                        vb[i].stride = input[i].stride;
                                        vb[i].buffer_offset = input[i].buffer_offset;
-                                       pipe_resource_reference(&vb[i].buffer, input[i].buffer);
+                                       pipe_resource_reference(&vb[i].buffer.resource, input[i].buffer.resource);
                                        new_buffer_mask |= 1 << i;
-                                       r600_context_add_resource_size(ctx, input[i].buffer);
+                                       r600_context_add_resource_size(ctx, input[i].buffer.resource);
                                } else {
-                                       pipe_resource_reference(&vb[i].buffer, NULL);
+                                       pipe_resource_reference(&vb[i].buffer.resource, NULL);
                                        disable_mask |= 1 << i;
                                }
                        }
                }
        } else {
                for (i = 0; i < count; i++) {
-                       pipe_resource_reference(&vb[i].buffer, NULL);
+                       pipe_resource_reference(&vb[i].buffer.resource, NULL);
                }
                disable_mask = ((1ull << count) - 1);
        }
@@ -590,14 +582,14 @@ void r600_sampler_views_dirty(struct r600_context *rctx,
                              struct r600_samplerview_state *state)
 {
        if (state->dirty_mask) {
-               rctx->b.flags |= R600_CONTEXT_INV_TEX_CACHE;
                state->atom.num_dw = (rctx->b.chip_class >= EVERGREEN ? 14 : 13) *
                                     util_bitcount(state->dirty_mask);
                r600_mark_atom_dirty(rctx, &state->atom);
        }
 }
 
-static void r600_set_sampler_views(struct pipe_context *pipe, unsigned shader,
+static void r600_set_sampler_views(struct pipe_context *pipe,
+                                  enum pipe_shader_type shader,
                                   unsigned start, unsigned count,
                                   struct pipe_sampler_view **views)
 {
@@ -640,7 +632,7 @@ static void r600_set_sampler_views(struct pipe_context *pipe, unsigned shader,
                                (struct r600_texture*)rviews[i]->base.texture;
                        bool is_buffer = rviews[i]->base.texture->target == PIPE_BUFFER;
 
-                       if (!is_buffer && rtex->is_depth && !rtex->is_flushing_texture) {
+                       if (!is_buffer && rtex->db_compatible) {
                                dst->views.compressed_depthtex_mask |= 1 << i;
                        } else {
                                dst->views.compressed_depthtex_mask &= ~(1 << i);
@@ -707,49 +699,47 @@ static void r600_update_compressed_colortex_mask(struct r600_samplerview_state *
 }
 
 /* Compute the key for the hw shader variant */
-static inline union r600_shader_key r600_shader_selector_key(struct pipe_context * ctx,
-               struct r600_pipe_shader_selector * sel)
+static inline void r600_shader_selector_key(const struct pipe_context *ctx,
+               const struct r600_pipe_shader_selector *sel,
+               union r600_shader_key *key)
 {
-       struct r600_context *rctx = (struct r600_context *)ctx;
-       union r600_shader_key key;
-       memset(&key, 0, sizeof(key));
+       const struct r600_context *rctx = (struct r600_context *)ctx;
+       memset(key, 0, sizeof(*key));
 
        switch (sel->type) {
        case PIPE_SHADER_VERTEX: {
-               key.vs.as_ls = (rctx->tes_shader != NULL);
-               if (!key.vs.as_ls)
-                       key.vs.as_es = (rctx->gs_shader != NULL);
+               key->vs.as_ls = (rctx->tes_shader != NULL);
+               if (!key->vs.as_ls)
+                       key->vs.as_es = (rctx->gs_shader != NULL);
 
                if (rctx->ps_shader->current->shader.gs_prim_id_input && !rctx->gs_shader) {
-                       key.vs.as_gs_a = true;
-                       key.vs.prim_id_out = rctx->ps_shader->current->shader.input[rctx->ps_shader->current->shader.ps_prim_id_input].spi_sid;
+                       key->vs.as_gs_a = true;
+                       key->vs.prim_id_out = rctx->ps_shader->current->shader.input[rctx->ps_shader->current->shader.ps_prim_id_input].spi_sid;
                }
                break;
        }
        case PIPE_SHADER_GEOMETRY:
                break;
        case PIPE_SHADER_FRAGMENT: {
-               key.ps.color_two_side = rctx->rasterizer && rctx->rasterizer->two_side;
-               key.ps.alpha_to_one = rctx->alpha_to_one &&
+               key->ps.color_two_side = rctx->rasterizer && rctx->rasterizer->two_side;
+               key->ps.alpha_to_one = rctx->alpha_to_one &&
                                      rctx->rasterizer && rctx->rasterizer->multisample_enable &&
                                      !rctx->framebuffer.cb0_is_integer;
-               key.ps.nr_cbufs = rctx->framebuffer.state.nr_cbufs;
+               key->ps.nr_cbufs = rctx->framebuffer.state.nr_cbufs;
                /* Dual-source blending only makes sense with nr_cbufs == 1. */
-               if (key.ps.nr_cbufs == 1 && rctx->dual_src_blend)
-                       key.ps.nr_cbufs = 2;
+               if (key->ps.nr_cbufs == 1 && rctx->dual_src_blend)
+                       key->ps.nr_cbufs = 2;
                break;
        }
        case PIPE_SHADER_TESS_EVAL:
-               key.tes.as_es = (rctx->gs_shader != NULL);
+               key->tes.as_es = (rctx->gs_shader != NULL);
                break;
        case PIPE_SHADER_TESS_CTRL:
-               key.tcs.prim_mode = rctx->tes_shader->info.properties[TGSI_PROPERTY_TES_PRIM_MODE];
+               key->tcs.prim_mode = rctx->tes_shader->info.properties[TGSI_PROPERTY_TES_PRIM_MODE];
                break;
        default:
                assert(0);
        }
-
-       return key;
 }
 
 /* Select the hw shader variant depending on the current state.
@@ -762,8 +752,7 @@ static int r600_shader_select(struct pipe_context *ctx,
        struct r600_pipe_shader * shader = NULL;
        int r;
 
-       memset(&key, 0, sizeof(key));
-       key = r600_shader_selector_key(ctx, sel);
+       r600_shader_selector_key(ctx, sel, &key);
 
        /* Check if we don't need to change anything.
         * This path is also used for most shaders that don't need multiple
@@ -807,7 +796,7 @@ static int r600_shader_select(struct pipe_context *ctx,
                if (sel->type == PIPE_SHADER_FRAGMENT &&
                                sel->num_shaders == 0) {
                        sel->nr_ps_max_color_exports = shader->shader.nr_ps_max_color_exports;
-                       key = r600_shader_selector_key(ctx, sel);
+                       r600_shader_selector_key(ctx, sel, &key);
                }
 
                memcpy(&shader->key, &key, sizeof(key));
@@ -929,7 +918,7 @@ static void r600_bind_vs_state(struct pipe_context *ctx, void *state)
 {
        struct r600_context *rctx = (struct r600_context *)ctx;
 
-       if (!state)
+       if (!state || rctx->vs_shader == state)
                return;
 
        rctx->vs_shader = (struct r600_pipe_shader_selector *)state;
@@ -941,6 +930,9 @@ static void r600_bind_gs_state(struct pipe_context *ctx, void *state)
 {
        struct r600_context *rctx = (struct r600_context *)ctx;
 
+       if (state == rctx->gs_shader)
+               return;
+
        rctx->gs_shader = (struct r600_pipe_shader_selector *)state;
        r600_update_vs_writes_viewport_index(&rctx->b, r600_get_vs_info(rctx));
 
@@ -960,6 +952,9 @@ static void r600_bind_tes_state(struct pipe_context *ctx, void *state)
 {
        struct r600_context *rctx = (struct r600_context *)ctx;
 
+       if (state == rctx->tes_shader)
+               return;
+
        rctx->tes_shader = (struct r600_pipe_shader_selector *)state;
        r600_update_vs_writes_viewport_index(&rctx->b, r600_get_vs_info(rctx));
 
@@ -1048,15 +1043,15 @@ static void r600_delete_tes_state(struct pipe_context *ctx, void *state)
 void r600_constant_buffers_dirty(struct r600_context *rctx, struct r600_constbuf_state *state)
 {
        if (state->dirty_mask) {
-               rctx->b.flags |= R600_CONTEXT_INV_CONST_CACHE;
                state->atom.num_dw = rctx->b.chip_class >= EVERGREEN ? util_bitcount(state->dirty_mask)*20
                                                                   : util_bitcount(state->dirty_mask)*19;
                r600_mark_atom_dirty(rctx, &state->atom);
        }
 }
 
-static void r600_set_constant_buffer(struct pipe_context *ctx, uint shader, uint index,
-                                    struct pipe_constant_buffer *input)
+static void r600_set_constant_buffer(struct pipe_context *ctx,
+                                    enum pipe_shader_type shader, uint index,
+                                    const struct pipe_constant_buffer *input)
 {
        struct r600_context *rctx = (struct r600_context *)ctx;
        struct r600_constbuf_state *state = &rctx->constbuf_state[shader];
@@ -1093,10 +1088,13 @@ static void r600_set_constant_buffer(struct pipe_context *ctx, uint shader, uint
                                tmpPtr[i] = util_cpu_to_le32(((uint32_t *)ptr)[i]);
                        }
 
-                       u_upload_data(rctx->b.uploader, 0, size, 256, tmpPtr, &cb->buffer_offset, &cb->buffer);
+                       u_upload_data(ctx->stream_uploader, 0, size, 256,
+                                      tmpPtr, &cb->buffer_offset, &cb->buffer);
                        free(tmpPtr);
                } else {
-                       u_upload_data(rctx->b.uploader, 0, input->buffer_size, 256, ptr, &cb->buffer_offset, &cb->buffer);
+                       u_upload_data(ctx->stream_uploader, 0,
+                                      input->buffer_size, 256, ptr,
+                                      &cb->buffer_offset, &cb->buffer);
                }
                /* account it in gtt */
                rctx->b.gtt += input->buffer_size;
@@ -1125,7 +1123,7 @@ static void r600_set_sample_mask(struct pipe_context *pipe, unsigned sample_mask
 
 static void r600_update_driver_const_buffers(struct r600_context *rctx)
 {
-       int sh, size;;
+       int sh, size;
        void *ptr;
        struct pipe_constant_buffer cb;
        for (sh = 0; sh < PIPE_SHADER_TYPES; sh++) {
@@ -1283,7 +1281,7 @@ void r600_set_sample_locations_constant_buffer(struct r600_context *rctx)
        struct pipe_context *ctx = &rctx->b.b;
 
        assert(rctx->framebuffer.nr_samples < R600_UCP_SIZE);
-       assert(rctx->framebuffer.nr_samples <= Elements(rctx->sample_positions)/4);
+       assert(rctx->framebuffer.nr_samples <= ARRAY_SIZE(rctx->sample_positions)/4);
 
        memset(rctx->sample_positions, 0, 4 * 4 * 16);
        for (i = 0; i < rctx->framebuffer.nr_samples; i++) {
@@ -1326,14 +1324,14 @@ static void update_gs_block_state(struct r600_context *rctx, unsigned enable)
                if (enable && !rctx->gs_rings.esgs_ring.buffer) {
                        unsigned size = 0x1C000;
                        rctx->gs_rings.esgs_ring.buffer =
-                                       pipe_buffer_create(rctx->b.b.screen, PIPE_BIND_CUSTOM,
+                                       pipe_buffer_create(rctx->b.b.screen, 0,
                                                        PIPE_USAGE_DEFAULT, size);
                        rctx->gs_rings.esgs_ring.buffer_size = size;
 
                        size = 0x4000000;
 
                        rctx->gs_rings.gsvs_ring.buffer =
-                                       pipe_buffer_create(rctx->b.b.screen, PIPE_BIND_CUSTOM,
+                                       pipe_buffer_create(rctx->b.b.screen, 0,
                                                        PIPE_USAGE_DEFAULT, size);
                        rctx->gs_rings.gsvs_ring.buffer_size = size;
                }
@@ -1378,7 +1376,7 @@ static void r600_generate_fixed_func_tcs(struct r600_context *rctx)
 {
        struct ureg_src const0, const1;
        struct ureg_dst tessouter, tessinner;
-       struct ureg_program *ureg = ureg_create(TGSI_PROCESSOR_TESS_CTRL);
+       struct ureg_program *ureg = ureg_create(PIPE_SHADER_TESS_CTRL);
 
        if (!ureg)
                return; /* if we get here, we're screwed */
@@ -1661,35 +1659,69 @@ void r600_emit_clip_misc_state(struct r600_context *rctx, struct r600_atom *atom
                                       S_028AB4_REUSE_OFF(state->vs_out_viewport));
 }
 
-static void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *dinfo)
+/* rast_prim is the primitive type after GS. */
+static inline void r600_emit_rasterizer_prim_state(struct r600_context *rctx)
+{
+       struct radeon_winsys_cs *cs = rctx->b.gfx.cs;
+       enum pipe_prim_type rast_prim = rctx->current_rast_prim;
+
+       /* Skip this if not rendering lines. */
+       if (rast_prim != PIPE_PRIM_LINES &&
+           rast_prim != PIPE_PRIM_LINE_LOOP &&
+           rast_prim != PIPE_PRIM_LINE_STRIP &&
+           rast_prim != PIPE_PRIM_LINES_ADJACENCY &&
+           rast_prim != PIPE_PRIM_LINE_STRIP_ADJACENCY)
+               return;
+
+       if (rast_prim == rctx->last_rast_prim)
+               return;
+
+       /* For lines, reset the stipple pattern at each primitive. Otherwise,
+        * reset the stipple pattern at each packet (line strips, line loops).
+        */
+       radeon_set_context_reg(cs, R_028A0C_PA_SC_LINE_STIPPLE,
+                              S_028A0C_AUTO_RESET_CNTL(rast_prim == PIPE_PRIM_LINES ? 1 : 2) |
+                              (rctx->rasterizer ? rctx->rasterizer->pa_sc_line_stipple : 0));
+       rctx->last_rast_prim = rast_prim;
+}
+
+static void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
 {
        struct r600_context *rctx = (struct r600_context *)ctx;
-       struct pipe_draw_info info = *dinfo;
-       struct pipe_index_buffer ib = {};
+       struct pipe_resource *indexbuf = info->has_user_indices ? NULL : info->index.resource;
        struct radeon_winsys_cs *cs = rctx->b.gfx.cs;
        bool render_cond_bit = rctx->b.render_cond && !rctx->b.render_cond_force_off;
+       bool has_user_indices = info->has_user_indices;
        uint64_t mask;
-       unsigned num_patches, dirty_fb_counter;
+       unsigned num_patches, dirty_tex_counter, index_offset = 0;
+       unsigned index_size = info->index_size;
+       int index_bias;
 
-       if (!info.indirect && !info.count && (info.indexed || !info.count_from_stream_output)) {
+       if (!info->indirect && !info->count && (index_size || !info->count_from_stream_output)) {
                return;
        }
 
-       if (!rctx->vs_shader || !rctx->ps_shader) {
+       if (unlikely(!rctx->vs_shader)) {
+               assert(0);
+               return;
+       }
+       if (unlikely(!rctx->ps_shader &&
+                    (!rctx->rasterizer || !rctx->rasterizer->rasterizer_discard))) {
                assert(0);
                return;
        }
 
        /* make sure that the gfx ring is only one active */
-       if (rctx->b.dma.cs && rctx->b.dma.cs->cdw) {
+       if (radeon_emitted(rctx->b.dma.cs, 0)) {
                rctx->b.dma.flush(rctx, RADEON_FLUSH_ASYNC, NULL);
        }
 
        /* Re-emit the framebuffer state if needed. */
-       dirty_fb_counter = p_atomic_read(&rctx->b.screen->dirty_fb_counter);
-       if (dirty_fb_counter != rctx->b.last_dirty_fb_counter) {
-               rctx->b.last_dirty_fb_counter = dirty_fb_counter;
+       dirty_tex_counter = p_atomic_read(&rctx->b.screen->dirty_tex_counter);
+       if (unlikely(dirty_tex_counter != rctx->b.last_dirty_tex_counter)) {
+               rctx->b.last_dirty_tex_counter = dirty_tex_counter;
                r600_mark_atom_dirty(rctx, &rctx->framebuffer.atom);
+               rctx->framebuffer.do_update_surf_dirtiness = true;
        }
 
        if (!r600_update_derived_state(rctx)) {
@@ -1699,35 +1731,32 @@ static void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info
                return;
        }
 
-       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;
-               if (!info.indirect) {
-                       ib.offset += info.start * ib.index_size;
-               }
+       rctx->current_rast_prim = (rctx->gs_shader)? rctx->gs_shader->gs_output_prim
+               : (rctx->tes_shader)? rctx->tes_shader->info.properties[TGSI_PROPERTY_TES_PRIM_MODE]
+               : info->mode;
+
+       if (index_size) {
+               index_offset += info->start * index_size;
 
                /* Translate 8-bit indices to 16-bit. */
-               if (unlikely(ib.index_size == 1)) {
+               if (unlikely(index_size == 1)) {
                        struct pipe_resource *out_buffer = NULL;
                        unsigned out_offset;
                        void *ptr;
                        unsigned start, count;
 
-                       if (likely(!info.indirect)) {
+                       if (likely(!info->indirect)) {
                                start = 0;
-                               count = info.count;
+                               count = info->count;
                        }
                        else {
                                /* Have to get start/count from indirect buffer, slow path ahead... */
-                               struct r600_resource *indirect_resource = (struct r600_resource *)info.indirect;
+                               struct r600_resource *indirect_resource = (struct r600_resource *)info->indirect->buffer;
                                unsigned *data = r600_buffer_map_sync_with_rings(&rctx->b, indirect_resource,
                                        PIPE_TRANSFER_READ);
                                if (data) {
-                                       data += info.indirect_offset / sizeof(unsigned);
-                                       start = data[2] * ib.index_size;
+                                       data += info->indirect->offset / sizeof(unsigned);
+                                       start = data[2] * index_size;
                                        count = data[0];
                                }
                                else {
@@ -1736,17 +1765,18 @@ static void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info
                                }
                        }
 
-                       u_upload_alloc(rctx->b.uploader, start, count * 2, 256,
-                                      &out_offset, &out_buffer, &ptr);
+                       u_upload_alloc(ctx->stream_uploader, start, count * 2,
+                                       256, &out_offset, &out_buffer, &ptr);
+                       if (unlikely(!ptr))
+                               return;
 
                        util_shorten_ubyte_elts_to_userptr(
-                                               &rctx->b.b, &ib, 0, ib.offset + start, count, ptr);
+                                               &rctx->b.b, info, 0, 0, index_offset, count, ptr);
 
-                       pipe_resource_reference(&ib.buffer, NULL);
-                       ib.user_buffer = NULL;
-                       ib.buffer = out_buffer;
-                       ib.offset = out_offset;
-                       ib.index_size = 2;
+                       indexbuf = out_buffer;
+                       index_offset = out_offset;
+                       index_size = 2;
+                       has_user_indices = false;
                }
 
                /* Upload the index buffer.
@@ -1754,25 +1784,28 @@ static void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info
                 * and the indices are emitted via PKT3_DRAW_INDEX_IMMD.
                 * Indirect draws never use immediate indices.
                 * Note: Instanced rendering in combination with immediate indices hangs. */
-               if (ib.user_buffer && (R600_BIG_ENDIAN || info.indirect ||
-                                                info.instance_count > 1 ||
-                                                info.count*ib.index_size > 20)) {
-                       u_upload_data(rctx->b.uploader, 0, info.count * ib.index_size, 256,
-                                     ib.user_buffer, &ib.offset, &ib.buffer);
-                       ib.user_buffer = NULL;
-               }
+               if (has_user_indices && (R600_BIG_ENDIAN || info->indirect ||
+                                                info->instance_count > 1 ||
+                                                info->count*index_size > 20)) {
+                       indexbuf = NULL;
+                       u_upload_data(ctx->stream_uploader, 0,
+                                      info->count * index_size, 256,
+                                     info->index.user, &index_offset, &indexbuf);
+                       has_user_indices = false;
+               }
+               index_bias = info->index_bias;
        } else {
-               info.index_bias = info.start;
+               index_bias = info->start;
        }
 
        /* Set the index offset and primitive restart. */
-       if (rctx->vgt_state.vgt_multi_prim_ib_reset_en != info.primitive_restart ||
-           rctx->vgt_state.vgt_multi_prim_ib_reset_indx != info.restart_index ||
-           rctx->vgt_state.vgt_indx_offset != info.index_bias ||
-           (rctx->vgt_state.last_draw_was_indirect && !info.indirect)) {
-               rctx->vgt_state.vgt_multi_prim_ib_reset_en = info.primitive_restart;
-               rctx->vgt_state.vgt_multi_prim_ib_reset_indx = info.restart_index;
-               rctx->vgt_state.vgt_indx_offset = info.index_bias;
+       if (rctx->vgt_state.vgt_multi_prim_ib_reset_en != info->primitive_restart ||
+           rctx->vgt_state.vgt_multi_prim_ib_reset_indx != info->restart_index ||
+           rctx->vgt_state.vgt_indx_offset != index_bias ||
+           (rctx->vgt_state.last_draw_was_indirect && !info->indirect)) {
+               rctx->vgt_state.vgt_multi_prim_ib_reset_en = info->primitive_restart;
+               rctx->vgt_state.vgt_multi_prim_ib_reset_indx = info->restart_index;
+               rctx->vgt_state.vgt_indx_offset = index_bias;
                r600_mark_atom_dirty(rctx, &rctx->vgt_state.atom);
        }
 
@@ -1783,10 +1816,10 @@ static void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info
        }
 
        if (rctx->b.chip_class >= EVERGREEN)
-               evergreen_setup_tess_constants(rctx, &info, &num_patches);
+               evergreen_setup_tess_constants(rctx, info, &num_patches);
 
        /* Emit states. */
-       r600_need_cs_space(rctx, ib.user_buffer ? 5 : 0, TRUE);
+       r600_need_cs_space(rctx, has_user_indices ? 5 : 0, TRUE);
        r600_flush_emit(rctx);
 
        mask = rctx->dirty_atoms;
@@ -1818,7 +1851,7 @@ static void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info
        }
 
        if (rctx->b.chip_class >= EVERGREEN) {
-               uint32_t ls_hs_config = evergreen_get_ls_hs_config(rctx, &info,
+               uint32_t ls_hs_config = evergreen_get_ls_hs_config(rctx, info,
                                                                   num_patches);
 
                evergreen_set_ls_hs_config(rctx, cs, ls_hs_config);
@@ -1829,7 +1862,7 @@ static void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info
         * even though it should have no effect on those. */
        if (rctx->b.chip_class == R600 && rctx->rasterizer) {
                unsigned su_sc_mode_cntl = rctx->rasterizer->pa_su_sc_mode_cntl;
-               unsigned prim = info.mode;
+               unsigned prim = info->mode;
 
                if (rctx->gs_shader) {
                        prim = rctx->gs_shader->gs_output_prim;
@@ -1838,143 +1871,130 @@ static void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info
 
                if (prim == V_028A6C_OUTPRIM_TYPE_POINTLIST ||
                    prim == V_028A6C_OUTPRIM_TYPE_LINESTRIP ||
-                   info.mode == R600_PRIM_RECTANGLE_LIST) {
+                   info->mode == R600_PRIM_RECTANGLE_LIST) {
                        su_sc_mode_cntl &= C_028814_CULL_FRONT;
                }
                radeon_set_context_reg(cs, R_028814_PA_SU_SC_MODE_CNTL, su_sc_mode_cntl);
        }
 
        /* Update start instance. */
-       if (!info.indirect && rctx->last_start_instance != info.start_instance) {
-               radeon_set_ctl_const(cs, R_03CFF4_SQ_VTX_START_INST_LOC, info.start_instance);
-               rctx->last_start_instance = info.start_instance;
+       if (!info->indirect && rctx->last_start_instance != info->start_instance) {
+               radeon_set_ctl_const(cs, R_03CFF4_SQ_VTX_START_INST_LOC, info->start_instance);
+               rctx->last_start_instance = info->start_instance;
        }
 
        /* Update the primitive type. */
-       if (rctx->last_primitive_type != info.mode) {
-               unsigned ls_mask = 0;
-
-               if (info.mode == PIPE_PRIM_LINES)
-                       ls_mask = 1;
-               else if (info.mode == PIPE_PRIM_LINE_STRIP ||
-                        info.mode == PIPE_PRIM_LINE_LOOP)
-                       ls_mask = 2;
-
-               radeon_set_context_reg(cs, R_028A0C_PA_SC_LINE_STIPPLE,
-                                      S_028A0C_AUTO_RESET_CNTL(ls_mask) |
-                                      (rctx->rasterizer ? rctx->rasterizer->pa_sc_line_stipple : 0));
+       if (rctx->last_primitive_type != info->mode) {
+               r600_emit_rasterizer_prim_state(rctx);
                radeon_set_config_reg(cs, R_008958_VGT_PRIMITIVE_TYPE,
-                                     r600_conv_pipe_prim(info.mode));
+                                     r600_conv_pipe_prim(info->mode));
 
-               rctx->last_primitive_type = info.mode;
+               rctx->last_primitive_type = info->mode;
        }
 
        /* Draw packets. */
-       if (!info.indirect) {
-               cs->buf[cs->cdw++] = PKT3(PKT3_NUM_INSTANCES, 0, 0);
-               cs->buf[cs->cdw++] = info.instance_count;
-       }
-
-       if (unlikely(info.indirect)) {
-               uint64_t va = r600_resource(info.indirect)->gpu_address;
+       if (likely(!info->indirect)) {
+               radeon_emit(cs, PKT3(PKT3_NUM_INSTANCES, 0, 0));
+               radeon_emit(cs, info->instance_count);
+       } else {
+               uint64_t va = r600_resource(info->indirect->buffer)->gpu_address;
                assert(rctx->b.chip_class >= EVERGREEN);
 
                // Invalidate so non-indirect draw calls reset this state
                rctx->vgt_state.last_draw_was_indirect = true;
                rctx->last_start_instance = -1;
 
-               cs->buf[cs->cdw++] = PKT3(EG_PKT3_SET_BASE, 2, 0);
-               cs->buf[cs->cdw++] = EG_DRAW_INDEX_INDIRECT_PATCH_TABLE_BASE;
-               cs->buf[cs->cdw++] = va;
-               cs->buf[cs->cdw++] = (va >> 32UL) & 0xFF;
+               radeon_emit(cs, PKT3(EG_PKT3_SET_BASE, 2, 0));
+               radeon_emit(cs, EG_DRAW_INDEX_INDIRECT_PATCH_TABLE_BASE);
+               radeon_emit(cs, va);
+               radeon_emit(cs, (va >> 32UL) & 0xFF);
 
-               cs->buf[cs->cdw++] = PKT3(PKT3_NOP, 0, 0);
-               cs->buf[cs->cdw++] = radeon_add_to_buffer_list(&rctx->b, &rctx->b.gfx,
-                                                          (struct r600_resource*)info.indirect,
-                                                          RADEON_USAGE_READ,
-                                                           RADEON_PRIO_DRAW_INDIRECT);
+               radeon_emit(cs, PKT3(PKT3_NOP, 0, 0));
+               radeon_emit(cs, radeon_add_to_buffer_list(&rctx->b, &rctx->b.gfx,
+                                                         (struct r600_resource*)info->indirect->buffer,
+                                                         RADEON_USAGE_READ,
+                                                          RADEON_PRIO_DRAW_INDIRECT));
        }
 
-       if (info.indexed) {
-               cs->buf[cs->cdw++] = PKT3(PKT3_INDEX_TYPE, 0, 0);
-               cs->buf[cs->cdw++] = ib.index_size == 4 ?
-                                       (VGT_INDEX_32 | (R600_BIG_ENDIAN ? VGT_DMA_SWAP_32_BIT : 0)) :
-                                       (VGT_INDEX_16 | (R600_BIG_ENDIAN ? VGT_DMA_SWAP_16_BIT : 0));
+       if (index_size) {
+               radeon_emit(cs, PKT3(PKT3_INDEX_TYPE, 0, 0));
+               radeon_emit(cs, index_size == 4 ?
+                               (VGT_INDEX_32 | (R600_BIG_ENDIAN ? VGT_DMA_SWAP_32_BIT : 0)) :
+                               (VGT_INDEX_16 | (R600_BIG_ENDIAN ? VGT_DMA_SWAP_16_BIT : 0)));
 
-               if (ib.user_buffer) {
-                       unsigned size_bytes = info.count*ib.index_size;
+               if (has_user_indices) {
+                       unsigned size_bytes = info->count*index_size;
                        unsigned size_dw = align(size_bytes, 4) / 4;
-                       cs->buf[cs->cdw++] = PKT3(PKT3_DRAW_INDEX_IMMD, 1 + size_dw, render_cond_bit);
-                       cs->buf[cs->cdw++] = info.count;
-                       cs->buf[cs->cdw++] = V_0287F0_DI_SRC_SEL_IMMEDIATE;
-                       memcpy(cs->buf+cs->cdw, ib.user_buffer, size_bytes);
-                       cs->cdw += size_dw;
+                       radeon_emit(cs, PKT3(PKT3_DRAW_INDEX_IMMD, 1 + size_dw, render_cond_bit));
+                       radeon_emit(cs, info->count);
+                       radeon_emit(cs, V_0287F0_DI_SRC_SEL_IMMEDIATE);
+                       radeon_emit_array(cs, info->index.user, size_dw);
                } else {
-                       uint64_t va = r600_resource(ib.buffer)->gpu_address + ib.offset;
-
-                       if (likely(!info.indirect)) {
-                               cs->buf[cs->cdw++] = PKT3(PKT3_DRAW_INDEX, 3, render_cond_bit);
-                               cs->buf[cs->cdw++] = va;
-                               cs->buf[cs->cdw++] = (va >> 32UL) & 0xFF;
-                               cs->buf[cs->cdw++] = info.count;
-                               cs->buf[cs->cdw++] = V_0287F0_DI_SRC_SEL_DMA;
-                               cs->buf[cs->cdw++] = PKT3(PKT3_NOP, 0, 0);
-                               cs->buf[cs->cdw++] = radeon_add_to_buffer_list(&rctx->b, &rctx->b.gfx,
-                                                                          (struct r600_resource*)ib.buffer,
-                                                                          RADEON_USAGE_READ,
-                                                                           RADEON_PRIO_INDEX_BUFFER);
+                       uint64_t va = r600_resource(indexbuf)->gpu_address + index_offset;
+
+                       if (likely(!info->indirect)) {
+                               radeon_emit(cs, PKT3(PKT3_DRAW_INDEX, 3, render_cond_bit));
+                               radeon_emit(cs, va);
+                               radeon_emit(cs, (va >> 32UL) & 0xFF);
+                               radeon_emit(cs, info->count);
+                               radeon_emit(cs, V_0287F0_DI_SRC_SEL_DMA);
+                               radeon_emit(cs, PKT3(PKT3_NOP, 0, 0));
+                               radeon_emit(cs, radeon_add_to_buffer_list(&rctx->b, &rctx->b.gfx,
+                                                                         (struct r600_resource*)indexbuf,
+                                                                         RADEON_USAGE_READ,
+                                                                          RADEON_PRIO_INDEX_BUFFER));
                        }
                        else {
-                               uint32_t max_size = (ib.buffer->width0 - ib.offset) / ib.index_size;
+                               uint32_t max_size = (indexbuf->width0 - index_offset) / index_size;
 
-                               cs->buf[cs->cdw++] = PKT3(EG_PKT3_INDEX_BASE, 1, 0);
-                               cs->buf[cs->cdw++] = va;
-                               cs->buf[cs->cdw++] = (va >> 32UL) & 0xFF;
+                               radeon_emit(cs, PKT3(EG_PKT3_INDEX_BASE, 1, 0));
+                               radeon_emit(cs, va);
+                               radeon_emit(cs, (va >> 32UL) & 0xFF);
 
-                               cs->buf[cs->cdw++] = PKT3(PKT3_NOP, 0, 0);
-                               cs->buf[cs->cdw++] = radeon_add_to_buffer_list(&rctx->b, &rctx->b.gfx,
-                                                                          (struct r600_resource*)ib.buffer,
-                                                                          RADEON_USAGE_READ,
-                                                                           RADEON_PRIO_INDEX_BUFFER);
+                               radeon_emit(cs, PKT3(PKT3_NOP, 0, 0));
+                               radeon_emit(cs, radeon_add_to_buffer_list(&rctx->b, &rctx->b.gfx,
+                                                                         (struct r600_resource*)indexbuf,
+                                                                         RADEON_USAGE_READ,
+                                                                          RADEON_PRIO_INDEX_BUFFER));
 
-                               cs->buf[cs->cdw++] = PKT3(EG_PKT3_INDEX_BUFFER_SIZE, 0, 0);
-                               cs->buf[cs->cdw++] = max_size;
+                               radeon_emit(cs, PKT3(EG_PKT3_INDEX_BUFFER_SIZE, 0, 0));
+                               radeon_emit(cs, max_size);
 
-                               cs->buf[cs->cdw++] = PKT3(EG_PKT3_DRAW_INDEX_INDIRECT, 1, render_cond_bit);
-                               cs->buf[cs->cdw++] = info.indirect_offset;
-                               cs->buf[cs->cdw++] = V_0287F0_DI_SRC_SEL_DMA;
+                               radeon_emit(cs, PKT3(EG_PKT3_DRAW_INDEX_INDIRECT, 1, render_cond_bit));
+                               radeon_emit(cs, info->indirect->offset);
+                               radeon_emit(cs, V_0287F0_DI_SRC_SEL_DMA);
                        }
                }
        } else {
-               if (unlikely(info.count_from_stream_output)) {
-                       struct r600_so_target *t = (struct r600_so_target*)info.count_from_stream_output;
+               if (unlikely(info->count_from_stream_output)) {
+                       struct r600_so_target *t = (struct r600_so_target*)info->count_from_stream_output;
                        uint64_t va = t->buf_filled_size->gpu_address + t->buf_filled_size_offset;
 
                        radeon_set_context_reg(cs, R_028B30_VGT_STRMOUT_DRAW_OPAQUE_VERTEX_STRIDE, t->stride_in_dw);
 
-                       cs->buf[cs->cdw++] = PKT3(PKT3_COPY_DW, 4, 0);
-                       cs->buf[cs->cdw++] = COPY_DW_SRC_IS_MEM | COPY_DW_DST_IS_REG;
-                       cs->buf[cs->cdw++] = va & 0xFFFFFFFFUL;     /* src address lo */
-                       cs->buf[cs->cdw++] = (va >> 32UL) & 0xFFUL; /* src address hi */
-                       cs->buf[cs->cdw++] = R_028B2C_VGT_STRMOUT_DRAW_OPAQUE_BUFFER_FILLED_SIZE >> 2; /* dst register */
-                       cs->buf[cs->cdw++] = 0; /* unused */
+                       radeon_emit(cs, PKT3(PKT3_COPY_DW, 4, 0));
+                       radeon_emit(cs, COPY_DW_SRC_IS_MEM | COPY_DW_DST_IS_REG);
+                       radeon_emit(cs, va & 0xFFFFFFFFUL);     /* src address lo */
+                       radeon_emit(cs, (va >> 32UL) & 0xFFUL); /* src address hi */
+                       radeon_emit(cs, R_028B2C_VGT_STRMOUT_DRAW_OPAQUE_BUFFER_FILLED_SIZE >> 2); /* dst register */
+                       radeon_emit(cs, 0); /* unused */
 
-                       cs->buf[cs->cdw++] = PKT3(PKT3_NOP, 0, 0);
-                       cs->buf[cs->cdw++] = radeon_add_to_buffer_list(&rctx->b, &rctx->b.gfx,
-                                                                  t->buf_filled_size, RADEON_USAGE_READ,
-                                                                  RADEON_PRIO_SO_FILLED_SIZE);
+                       radeon_emit(cs, PKT3(PKT3_NOP, 0, 0));
+                       radeon_emit(cs, radeon_add_to_buffer_list(&rctx->b, &rctx->b.gfx,
+                                                                 t->buf_filled_size, RADEON_USAGE_READ,
+                                                                 RADEON_PRIO_SO_FILLED_SIZE));
                }
 
-               if (likely(!info.indirect)) {
-                       cs->buf[cs->cdw++] = PKT3(PKT3_DRAW_INDEX_AUTO, 1, render_cond_bit);
-                       cs->buf[cs->cdw++] = info.count;
+               if (likely(!info->indirect)) {
+                       radeon_emit(cs, PKT3(PKT3_DRAW_INDEX_AUTO, 1, render_cond_bit));
+                       radeon_emit(cs, info->count);
                }
                else {
-                       cs->buf[cs->cdw++] = PKT3(EG_PKT3_DRAW_INDIRECT, 1, render_cond_bit);
-                       cs->buf[cs->cdw++] = info.indirect_offset;
+                       radeon_emit(cs, PKT3(EG_PKT3_DRAW_INDIRECT, 1, render_cond_bit));
+                       radeon_emit(cs, info->indirect->offset);
                }
-               cs->buf[cs->cdw++] = V_0287F0_DI_SRC_SEL_AUTO_INDEX |
-                                       (info.count_from_stream_output ? S_0287F0_USE_OPAQUE(1) : 0);
+               radeon_emit(cs, V_0287F0_DI_SRC_SEL_AUTO_INDEX |
+                               (info->count_from_stream_output ? S_0287F0_USE_OPAQUE(1) : 0));
        }
 
        /* SMX returns CONTEXT_DONE too early workaround */
@@ -1991,36 +2011,43 @@ static void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info
 
        /* ES ring rolling over at EOP - workaround */
        if (rctx->b.chip_class == R600) {
-               cs->buf[cs->cdw++] = PKT3(PKT3_EVENT_WRITE, 0, 0);
-               cs->buf[cs->cdw++] = EVENT_TYPE(EVENT_TYPE_SQ_NON_EVENT);
+               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
+               radeon_emit(cs, EVENT_TYPE(EVENT_TYPE_SQ_NON_EVENT));
        }
 
-       /* Set the depth buffer as dirty. */
-       if (rctx->framebuffer.state.zsbuf) {
-               struct pipe_surface *surf = rctx->framebuffer.state.zsbuf;
-               struct r600_texture *rtex = (struct r600_texture *)surf->texture;
+       if (rctx->trace_buf)
+               eg_trace_emit(rctx);
 
-               rtex->dirty_level_mask |= 1 << surf->u.tex.level;
+       if (rctx->framebuffer.do_update_surf_dirtiness) {
+               /* Set the depth buffer as dirty. */
+               if (rctx->framebuffer.state.zsbuf) {
+                       struct pipe_surface *surf = rctx->framebuffer.state.zsbuf;
+                       struct r600_texture *rtex = (struct r600_texture *)surf->texture;
 
-               if (rtex->surface.flags & RADEON_SURF_SBUFFER)
-                       rtex->stencil_dirty_level_mask |= 1 << surf->u.tex.level;
-       }
-       if (rctx->framebuffer.compressed_cb_mask) {
-               struct pipe_surface *surf;
-               struct r600_texture *rtex;
-               unsigned mask = rctx->framebuffer.compressed_cb_mask;
+                       rtex->dirty_level_mask |= 1 << surf->u.tex.level;
 
-               do {
-                       unsigned i = u_bit_scan(&mask);
-                       surf = rctx->framebuffer.state.cbufs[i];
-                       rtex = (struct r600_texture*)surf->texture;
+                       if (rtex->surface.flags & RADEON_SURF_SBUFFER)
+                               rtex->stencil_dirty_level_mask |= 1 << surf->u.tex.level;
+               }
+               if (rctx->framebuffer.compressed_cb_mask) {
+                       struct pipe_surface *surf;
+                       struct r600_texture *rtex;
+                       unsigned mask = rctx->framebuffer.compressed_cb_mask;
 
-                       rtex->dirty_level_mask |= 1 << surf->u.tex.level;
+                       do {
+                               unsigned i = u_bit_scan(&mask);
+                               surf = rctx->framebuffer.state.cbufs[i];
+                               rtex = (struct r600_texture*)surf->texture;
 
-               } while (mask);
+                               rtex->dirty_level_mask |= 1 << surf->u.tex.level;
+
+                       } while (mask);
+               }
+               rctx->framebuffer.do_update_surf_dirtiness = false;
        }
 
-       pipe_resource_reference(&ib.buffer, NULL);
+       if (index_size && indexbuf != info->index.resource)
+               pipe_resource_reference(&indexbuf, NULL);
        rctx->b.num_draw_calls++;
 }
 
@@ -2158,7 +2185,7 @@ void r600_emit_shader(struct r600_context *rctx, struct r600_atom *a)
        r600_emit_command_buffer(cs, &shader->command_buffer);
        radeon_emit(cs, PKT3(PKT3_NOP, 0, 0));
        radeon_emit(cs, radeon_add_to_buffer_list(&rctx->b, &rctx->b.gfx, shader->bo,
-                                             RADEON_USAGE_READ, RADEON_PRIO_USER_SHADER));
+                                             RADEON_USAGE_READ, RADEON_PRIO_SHADER_BINARY));
 }
 
 unsigned r600_get_swizzle_combined(const unsigned char *swizzle_format,
@@ -2217,7 +2244,8 @@ unsigned r600_get_swizzle_combined(const unsigned char *swizzle_format,
 uint32_t r600_translate_texformat(struct pipe_screen *screen,
                                  enum pipe_format format,
                                  const unsigned char *swizzle_view,
-                                 uint32_t *word4_p, uint32_t *yuv_format_p)
+                                 uint32_t *word4_p, uint32_t *yuv_format_p,
+                                 bool do_endian_swap)
 {
        struct r600_screen *rscreen = (struct r600_screen *)screen;
        uint32_t result = 0, word4 = 0, yuv_format = 0;
@@ -2226,6 +2254,9 @@ uint32_t r600_translate_texformat(struct pipe_screen *screen,
        bool is_srgb_valid = FALSE;
        const unsigned char swizzle_xxxx[4] = {0, 0, 0, 0};
        const unsigned char swizzle_yyyy[4] = {1, 1, 1, 1};
+       const unsigned char swizzle_xxxy[4] = {0, 0, 0, 1};
+       const unsigned char swizzle_zyx1[4] = {2, 1, 0, 5};
+       const unsigned char swizzle_zyxw[4] = {2, 1, 0, 3};
 
        int i;
        const uint32_t sign_bit[4] = {
@@ -2234,11 +2265,41 @@ uint32_t r600_translate_texformat(struct pipe_screen *screen,
                S_038010_FORMAT_COMP_Z(V_038010_SQ_FORMAT_COMP_SIGNED),
                S_038010_FORMAT_COMP_W(V_038010_SQ_FORMAT_COMP_SIGNED)
        };
+
+       /* Need to replace the specified texture formats in case of big-endian.
+        * These formats are formats that have channels with number of bits
+        * not divisible by 8.
+        * Mesa conversion functions don't swap bits for those formats, and because
+        * we transmit this over a serial bus to the GPU (PCIe), the
+        * bit-endianess is important!!!
+        * In case we have an "opposite" format, just use that for the swizzling
+        * information. If we don't have such an "opposite" format, we need
+        * to use a fixed swizzle info instead (see below)
+        */
+       if (format == PIPE_FORMAT_R4A4_UNORM && do_endian_swap)
+               format = PIPE_FORMAT_A4R4_UNORM;
+
        desc = util_format_description(format);
 
        /* Depth and stencil swizzling is handled separately. */
        if (desc->colorspace != UTIL_FORMAT_COLORSPACE_ZS) {
-               word4 |= r600_get_swizzle_combined(desc->swizzle, swizzle_view, FALSE);
+               /* Need to check for specific texture formats that don't have
+                * an "opposite" format we can use. For those formats, we directly
+                * specify the swizzling, which is the LE swizzling as defined in
+                * u_format.csv
+                */
+               if (do_endian_swap) {
+                       if (format == PIPE_FORMAT_L4A4_UNORM)
+                               word4 |= r600_get_swizzle_combined(swizzle_xxxy, swizzle_view, FALSE);
+                       else if (format == PIPE_FORMAT_B4G4R4A4_UNORM)
+                               word4 |= r600_get_swizzle_combined(swizzle_zyxw, swizzle_view, FALSE);
+                       else if (format == PIPE_FORMAT_B4G4R4X4_UNORM || format == PIPE_FORMAT_B5G6R5_UNORM)
+                               word4 |= r600_get_swizzle_combined(swizzle_zyx1, swizzle_view, FALSE);
+                       else
+                               word4 |= r600_get_swizzle_combined(desc->swizzle, swizzle_view, FALSE);
+               } else {
+                       word4 |= r600_get_swizzle_combined(desc->swizzle, swizzle_view, FALSE);
+               }
        }
 
        /* Colorspace (return non-RGB formats directly). */
@@ -2579,7 +2640,8 @@ out_unknown:
        return ~0;
 }
 
-uint32_t r600_translate_colorformat(enum chip_class chip, enum pipe_format format)
+uint32_t r600_translate_colorformat(enum chip_class chip, enum pipe_format format,
+                                               bool do_endian_swap)
 {
        const struct util_format_description *desc = util_format_description(format);
        int channel = util_format_get_first_non_void_channel(format);
@@ -2637,7 +2699,7 @@ uint32_t r600_translate_colorformat(enum chip_class chip, enum pipe_format forma
                                        return V_0280A0_COLOR_32_32;
                        }
                } else if (HAS_SIZE(8,24,0,0)) {
-                       return V_0280A0_COLOR_24_8;
+                       return (do_endian_swap ? V_0280A0_COLOR_8_24 : V_0280A0_COLOR_24_8);
                } else if (HAS_SIZE(24,8,0,0)) {
                        return V_0280A0_COLOR_8_24;
                }
@@ -2679,7 +2741,7 @@ uint32_t r600_translate_colorformat(enum chip_class chip, enum pipe_format forma
        return ~0U;
 }
 
-uint32_t r600_colorformat_endian_swap(uint32_t colorformat)
+uint32_t r600_colorformat_endian_swap(uint32_t colorformat, bool do_endian_swap)
 {
        if (R600_BIG_ENDIAN) {
                switch(colorformat) {
@@ -2689,17 +2751,24 @@ uint32_t r600_colorformat_endian_swap(uint32_t colorformat)
                        return ENDIAN_NONE;
 
                /* 16-bit buffers. */
+               case V_0280A0_COLOR_8_8:
+                       /*
+                        * No need to do endian swaps on array formats,
+                        * as mesa<-->pipe formats conversion take into account
+                        * the endianess
+                        */
+                       return ENDIAN_NONE;
+
                case V_0280A0_COLOR_5_6_5:
                case V_0280A0_COLOR_1_5_5_5:
                case V_0280A0_COLOR_4_4_4_4:
                case V_0280A0_COLOR_16:
-               case V_0280A0_COLOR_8_8:
-                       return ENDIAN_8IN16;
+                       return (do_endian_swap ? ENDIAN_8IN16 : ENDIAN_NONE);
 
                /* 32-bit buffers. */
                case V_0280A0_COLOR_8_8_8_8:
                        /*
-                        * No need to do endian swaps on four 8-bits components,
+                        * No need to do endian swaps on array formats,
                         * as mesa<-->pipe formats conversion take into account
                         * the endianess
                         */
@@ -2709,9 +2778,11 @@ uint32_t r600_colorformat_endian_swap(uint32_t colorformat)
                case V_0280A0_COLOR_8_24:
                case V_0280A0_COLOR_24_8:
                case V_0280A0_COLOR_32_FLOAT:
+                       return (do_endian_swap ? ENDIAN_8IN32 : ENDIAN_NONE);
+
                case V_0280A0_COLOR_16_16_FLOAT:
                case V_0280A0_COLOR_16_16:
-                       return ENDIAN_8IN32;
+                       return ENDIAN_8IN16;
 
                /* 64-bit buffers. */
                case V_0280A0_COLOR_16_16_16_16:
@@ -2739,26 +2810,26 @@ static void r600_invalidate_buffer(struct pipe_context *ctx, struct pipe_resourc
 {
        struct r600_context *rctx = (struct r600_context*)ctx;
        struct r600_resource *rbuffer = r600_resource(buf);
-       unsigned i, shader, mask, alignment = rbuffer->buf->alignment;
+       unsigned i, shader, mask;
        struct r600_pipe_sampler_view *view;
 
        /* Reallocate the buffer in the same pipe_resource. */
-       r600_init_resource(&rctx->screen->b, rbuffer, rbuffer->b.b.width0,
-                          alignment, TRUE);
+       r600_alloc_resource(&rctx->screen->b, rbuffer);
 
        /* We changed the buffer, now we need to bind it where the old one was bound. */
        /* Vertex buffers. */
        mask = rctx->vertex_buffer_state.enabled_mask;
        while (mask) {
                i = u_bit_scan(&mask);
-               if (rctx->vertex_buffer_state.vb[i].buffer == &rbuffer->b.b) {
+               if (rctx->vertex_buffer_state.vb[i].buffer.resource == &rbuffer->b.b) {
                        rctx->vertex_buffer_state.dirty_mask |= 1 << i;
                        r600_vertex_buffers_dirty(rctx);
                }
        }
        /* Streamout buffers. */
        for (i = 0; i < rctx->b.streamout.num_targets; i++) {
-               if (rctx->b.streamout.targets[i]->b.buffer == &rbuffer->b.b) {
+               if (rctx->b.streamout.targets[i] &&
+                   rctx->b.streamout.targets[i]->b.buffer == &rbuffer->b.b) {
                        if (rctx->b.streamout.begin_emitted) {
                                r600_emit_streamout_end(&rctx->b);
                        }
@@ -2786,10 +2857,9 @@ static void r600_invalidate_buffer(struct pipe_context *ctx, struct pipe_resourc
        }
 
        /* Texture buffer objects - update the virtual addresses in descriptors. */
-       LIST_FOR_EACH_ENTRY(view, &rctx->b.texture_buffers, list) {
+       LIST_FOR_EACH_ENTRY(view, &rctx->texture_buffers, list) {
                if (view->base.texture == &rbuffer->b.b) {
-                       unsigned stride = util_format_get_blocksize(view->base.format);
-                       uint64_t offset = (uint64_t)view->base.u.buf.first_element * stride;
+                       uint64_t offset = view->base.u.buf.offset;
                        uint64_t va = rbuffer->gpu_address + offset;
 
                        view->tex_resource_words[0] = va;
@@ -2884,7 +2954,6 @@ void r600_init_common_state_functions(struct r600_context *rctx)
        rctx->b.b.set_sample_mask = r600_set_sample_mask;
        rctx->b.b.set_stencil_ref = r600_set_pipe_stencil_ref;
        rctx->b.b.set_vertex_buffers = r600_set_vertex_buffers;
-       rctx->b.b.set_index_buffer = r600_set_index_buffer;
        rctx->b.b.set_sampler_views = r600_set_sampler_views;
        rctx->b.b.sampler_view_destroy = r600_sampler_view_destroy;
        rctx->b.b.texture_barrier = r600_texture_barrier;