gallium: change set_constant_buffer to be UBO-friendly

[mesa.git] / src / gallium / drivers / r600 / r600_state_common.c

diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
index 864996d006f5621af6f77bc355b3a792422b716b..6f888df6a301603c04adc868a66536363263b3c4 100644 (file)
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -358,8 +358,6 @@ void r600_bind_vertex_elements(struct pipe_context *ctx, void *state)
        rctx->vertex_elements = v;
        if (v) {
                r600_inval_shader_cache(rctx);
-               u_vbuf_bind_vertex_elements(rctx->vbuf_mgr, state,
-                                               v->vmgr_elements);
 
                rctx->states[v->rstate.id] = &v->rstate;
                r600_context_pipe_state_set(rctx, &v->rstate);
@@ -378,7 +376,6 @@ void r600_delete_vertex_element(struct pipe_context *ctx, void *state)
                rctx->vertex_elements = NULL;
 
        pipe_resource_reference((struct pipe_resource**)&v->fetch_shader, NULL);
-       u_vbuf_destroy_vertex_elements(rctx->vbuf_mgr, v->vmgr_elements);
        FREE(state);
 }
 
@@ -401,7 +398,11 @@ void r600_set_vertex_buffers(struct pipe_context *ctx, unsigned count,
        struct r600_context *rctx = (struct r600_context *)ctx;
 
        util_copy_vertex_buffers(rctx->vertex_buffer, &rctx->nr_vertex_buffers, buffers, count);
-       rctx->vertex_buffers_dirty = true;
+
+       r600_inval_vertex_cache(rctx);
+       rctx->vertex_buffer_state.num_dw = (rctx->chip_class >= EVERGREEN ? 12 : 10) *
+                                          rctx->nr_vertex_buffers;
+       r600_atom_dirty(rctx, &rctx->vertex_buffer_state);
 }
 
 void *r600_create_vertex_elements(struct pipe_context *ctx,
@@ -416,9 +417,7 @@ void *r600_create_vertex_elements(struct pipe_context *ctx,
                return NULL;
 
        v->count = count;
-       v->vmgr_elements =
-               u_vbuf_create_vertex_elements(rctx->vbuf_mgr, count,
-                                                 elements, v->elements);
+       memcpy(v->elements, elements, sizeof(struct pipe_vertex_element) * count);
 
        if (r600_vertex_elements_build_fetch_shader(rctx, v)) {
                FREE(v);
@@ -531,11 +530,11 @@ void r600_constant_buffers_dirty(struct r600_context *rctx, struct r600_constbuf
 }
 
 void r600_set_constant_buffer(struct pipe_context *ctx, uint shader, uint index,
-                             struct pipe_resource *buffer)
+                             struct pipe_constant_buffer *input)
 {
        struct r600_context *rctx = (struct r600_context *)ctx;
        struct r600_constbuf_state *state;
-       struct r600_constant_buffer *cb;
+       struct pipe_constant_buffer *cb;
        uint8_t *ptr;
 
        switch (shader) {
@@ -552,7 +551,7 @@ void r600_set_constant_buffer(struct pipe_context *ctx, uint shader, uint index,
        /* Note that the state tracker can unbind constant buffers by
         * passing NULL here.
         */
-       if (unlikely(!buffer)) {
+       if (unlikely(!input)) {
                state->enabled_mask &= ~(1 << index);
                state->dirty_mask &= ~(1 << index);
                pipe_resource_reference(&state->cb[index].buffer, NULL);
@@ -560,15 +559,15 @@ void r600_set_constant_buffer(struct pipe_context *ctx, uint shader, uint index,
        }
 
        cb = &state->cb[index];
-       cb->buffer_size = buffer->width0;
+       cb->buffer_size = input->buffer_size;
 
-       ptr = u_vbuf_resource(buffer)->user_ptr;
+       ptr = input->buffer->user_ptr;
 
        if (ptr) {
                /* Upload the user buffer. */
                if (R600_BIG_ENDIAN) {
                        uint32_t *tmpPtr;
-                       unsigned i, size = buffer->width0;
+                       unsigned i, size = input->buffer_size;
 
                        if (!(tmpPtr = malloc(size))) {
                                R600_ERR("Failed to allocate BE swap buffer.\n");
@@ -579,15 +578,15 @@ void r600_set_constant_buffer(struct pipe_context *ctx, uint shader, uint index,
                                tmpPtr[i] = bswap_32(((uint32_t *)ptr)[i]);
                        }
 
-                       u_upload_data(rctx->vbuf_mgr->uploader, 0, size, tmpPtr, &cb->buffer_offset, &cb->buffer);
+                       u_upload_data(rctx->uploader, 0, size, tmpPtr, &cb->buffer_offset, &cb->buffer);
                        free(tmpPtr);
                } else {
-                       u_upload_data(rctx->vbuf_mgr->uploader, 0, buffer->width0, ptr, &cb->buffer_offset, &cb->buffer);
+                       u_upload_data(rctx->uploader, 0, input->buffer_size, ptr, &cb->buffer_offset, &cb->buffer);
                }
        } else {
                /* Setup the hw buffer. */
-               cb->buffer_offset = 0;
-               pipe_resource_reference(&cb->buffer, buffer);
+               cb->buffer_offset = input->buffer_offset;
+               pipe_resource_reference(&cb->buffer, input->buffer);
        }
 
        state->enabled_mask |= 1 << index;
@@ -618,9 +617,9 @@ r600_create_so_target(struct pipe_context *ctx,
 
        t->filled_size = (struct r600_resource*)
                pipe_buffer_create(ctx->screen, PIPE_BIND_CUSTOM, PIPE_USAGE_STATIC, 4);
-       ptr = rctx->ws->buffer_map(t->filled_size->buf, rctx->cs, PIPE_TRANSFER_WRITE);
+       ptr = rctx->ws->buffer_map(t->filled_size->cs_buf, rctx->cs, PIPE_TRANSFER_WRITE);
        memset(ptr, 0, t->filled_size->buf->size);
-       rctx->ws->buffer_unmap(t->filled_size->buf);
+       rctx->ws->buffer_unmap(t->filled_size->cs_buf);
 
        return &t->b;
 }
@@ -765,16 +764,6 @@ void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *dinfo)
 
        r600_update_derived_state(rctx);
 
-       /* Update vertex buffers. */
-       u_vbuf_draw_begin(rctx->vbuf_mgr, &info);
-       if (rctx->vertex_buffers_dirty) {
-               r600_inval_vertex_cache(rctx);
-               rctx->vertex_buffer_state.num_dw = (rctx->chip_class >= EVERGREEN ? 12 : 10) *
-                                                  rctx->nr_vertex_buffers;
-               r600_atom_dirty(rctx, &rctx->vertex_buffer_state);
-               rctx->vertex_buffers_dirty = FALSE;
-       }
-
        if (info.indexed) {
                /* Initialize the index buffer struct. */
                pipe_resource_reference(&ib.buffer, rctx->index_buffer.buffer);
@@ -784,9 +773,9 @@ void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *dinfo)
                /* Translate or upload, if needed. */
                r600_translate_index_buffer(rctx, &ib, info.count);
 
-               ptr = u_vbuf_resource(ib.buffer)->user_ptr;
+               ptr = ib.buffer->user_ptr;
                if (ptr) {
-                       u_upload_data(rctx->vbuf_mgr->uploader, 0, info.count * ib.index_size,
+                       u_upload_data(rctx->uploader, 0, info.count * ib.index_size,
                                      ptr, &ib.offset, &ib.buffer);
                }
        } else {
@@ -907,7 +896,6 @@ void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *dinfo)
        }
 
        pipe_resource_reference(&ib.buffer, NULL);
-       u_vbuf_draw_end(rctx->vbuf_mgr);
 }
 
 void _r600_pipe_state_add_reg_bo(struct r600_context *ctx,