diff options
Diffstat (limited to 'src/gallium/drivers/r600/r600_state_common.c')
-rw-r--r-- | src/gallium/drivers/r600/r600_state_common.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c index 9386f618b3a..33200a6d178 100644 --- a/src/gallium/drivers/r600/r600_state_common.c +++ b/src/gallium/drivers/r600/r600_state_common.c @@ -479,7 +479,8 @@ static void r600_set_index_buffer(struct pipe_context *ctx, if (ib) { pipe_resource_reference(&rctx->index_buffer.buffer, ib->buffer); - memcpy(&rctx->index_buffer, ib, sizeof(*ib)); + memcpy(&rctx->index_buffer, ib, sizeof(*ib)); + r600_context_add_resource_size(ctx, ib->buffer); } else { pipe_resource_reference(&rctx->index_buffer.buffer, NULL); } @@ -516,6 +517,7 @@ static void r600_set_vertex_buffers(struct pipe_context *ctx, vb[i].buffer_offset = input[i].buffer_offset; pipe_resource_reference(&vb[i].buffer, input[i].buffer); new_buffer_mask |= 1 << i; + r600_context_add_resource_size(ctx, input[i].buffer); } else { pipe_resource_reference(&vb[i].buffer, NULL); disable_mask |= 1 << i; @@ -613,6 +615,7 @@ static void r600_set_sampler_views(struct pipe_context *pipe, unsigned shader, pipe_sampler_view_reference((struct pipe_sampler_view **)&dst->views.views[i], views[i]); new_mask |= 1 << i; + r600_context_add_resource_size(pipe, views[i]->texture); } else { pipe_sampler_view_reference((struct pipe_sampler_view **)&dst->views.views[i], NULL); disable_mask |= 1 << i; @@ -806,6 +809,8 @@ static void r600_bind_ps_state(struct pipe_context *ctx, void *state) rctx->ps_shader = (struct r600_pipe_shader_selector *)state; r600_context_pipe_state_set(rctx, &rctx->ps_shader->current->rstate); + r600_context_add_resource_size(ctx, (struct pipe_resource *)rctx->ps_shader->current->bo); + if (rctx->chip_class <= R700) { bool multiwrite = rctx->ps_shader->current->shader.fs_write_all; @@ -835,6 +840,8 @@ static void r600_bind_vs_state(struct pipe_context *ctx, void *state) if (state) { r600_context_pipe_state_set(rctx, &rctx->vs_shader->current->rstate); + r600_context_add_resource_size(ctx, (struct pipe_resource *)rctx->vs_shader->current->bo); + /* Update clip misc state. */ if (rctx->vs_shader->current->pa_cl_vs_out_cntl != rctx->clip_misc_state.pa_cl_vs_out_cntl || rctx->vs_shader->current->shader.clip_dist_write != rctx->clip_misc_state.clip_dist_write) { @@ -938,10 +945,13 @@ static void r600_set_constant_buffer(struct pipe_context *ctx, uint shader, uint } else { u_upload_data(rctx->uploader, 0, input->buffer_size, ptr, &cb->buffer_offset, &cb->buffer); } + /* account it in gtt */ + rctx->gtt += input->buffer_size; } else { /* Setup the hw buffer. */ cb->buffer_offset = input->buffer_offset; pipe_resource_reference(&cb->buffer, input->buffer); + r600_context_add_resource_size(ctx, input->buffer); } state->enabled_mask |= 1 << index; @@ -1004,6 +1014,7 @@ static void r600_set_so_targets(struct pipe_context *ctx, /* Set the new targets. */ for (i = 0; i < num_targets; i++) { pipe_so_target_reference((struct pipe_stream_output_target**)&rctx->so_targets[i], targets[i]); + r600_context_add_resource_size(ctx, targets[i]->buffer); } for (; i < rctx->num_so_targets; i++) { pipe_so_target_reference((struct pipe_stream_output_target**)&rctx->so_targets[i], NULL); |