diff options
| author | Marek Olšák <[email protected]> | 2012-04-24 22:53:05 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-04-30 01:18:48 +0200 |
| commit | 0b7d48cbad86eaac21fce3793da41b46db8be3b4 (patch) | |
| tree | 437f5cfeb3a77278d29e384b47dfaef9b96faa75 /src/gallium/drivers/r600 | |
| parent | 01bf5569c44389c1127bbb9e873c8a234ac92ff7 (diff) | |
gallium: add void *user_buffer to pipe_constant_buffer
This reduces CPU overhead when updating constants.
Diffstat (limited to 'src/gallium/drivers/r600')
| -rw-r--r-- | src/gallium/drivers/r600/evergreen_state.c | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_state.c | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_state_common.c | 4 |
3 files changed, 6 insertions, 10 deletions
diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index 4b9338d3464..517121dc288 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -1203,10 +1203,8 @@ static void evergreen_set_clip_state(struct pipe_context *ctx, rctx->states[R600_PIPE_STATE_CLIP] = rstate; r600_context_pipe_state_set(rctx, rstate); - cb.buffer = pipe_user_buffer_create(ctx->screen, - state->ucp, - 4*4*8, /* 8*4 floats */ - PIPE_BIND_CONSTANT_BUFFER); + cb.buffer = NULL; + cb.user_buffer = state->ucp; cb.buffer_offset = 0; cb.buffer_size = 4*4*8; r600_set_constant_buffer(ctx, PIPE_SHADER_VERTEX, 1, &cb); diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c index 81ffaa8bfd9..3a83b613e58 100644 --- a/src/gallium/drivers/r600/r600_state.c +++ b/src/gallium/drivers/r600/r600_state.c @@ -1286,10 +1286,8 @@ static void r600_set_clip_state(struct pipe_context *ctx, rctx->states[R600_PIPE_STATE_CLIP] = rstate; r600_context_pipe_state_set(rctx, rstate); - cb.buffer = pipe_user_buffer_create(ctx->screen, - state->ucp, - 4*4*8, /* 8*4 floats */ - PIPE_BIND_CONSTANT_BUFFER); + cb.buffer = NULL; + cb.user_buffer = state->ucp; cb.buffer_offset = 0; cb.buffer_size = 4*4*8; r600_set_constant_buffer(ctx, PIPE_SHADER_VERTEX, 1, &cb); diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c index 9e1f016f294..ccae7d91d43 100644 --- a/src/gallium/drivers/r600/r600_state_common.c +++ b/src/gallium/drivers/r600/r600_state_common.c @@ -535,7 +535,7 @@ void r600_set_constant_buffer(struct pipe_context *ctx, uint shader, uint index, struct r600_context *rctx = (struct r600_context *)ctx; struct r600_constbuf_state *state; struct pipe_constant_buffer *cb; - uint8_t *ptr; + const uint8_t *ptr; switch (shader) { case PIPE_SHADER_VERTEX: @@ -561,7 +561,7 @@ void r600_set_constant_buffer(struct pipe_context *ctx, uint shader, uint index, cb = &state->cb[index]; cb->buffer_size = input->buffer_size; - ptr = input->buffer->user_ptr; + ptr = input->user_buffer; if (ptr) { /* Upload the user buffer. */ |