summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/r600/r600_state_common.c
diff options
context:
space:
mode:
authorHenri Verbeet <hverbeet@gmail.com>2011-02-07 15:22:07 +0100
committerHenri Verbeet <hverbeet@gmail.com>2011-02-07 15:22:07 +0100
commit5c59eebfae55240a2308c02b0a6ad971c9b83304 (patch)
tree33ae725527c2e12651f6ed9df0d5214ff05193f9 /src/gallium/drivers/r600/r600_state_common.c
parentb9fd1a1e4b2121225195056ea1b679d62c399ddb (diff)
r600g: Generalize the pipe_add_vertex_attrib() functions.
This allows them to be used for VS or PS buffer resources as well.
Diffstat (limited to 'src/gallium/drivers/r600/r600_state_common.c')
-rw-r--r--src/gallium/drivers/r600/r600_state_common.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
index b17686d775..a2b2c17e2e 100644
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -398,13 +398,11 @@ static void r600_vertex_buffer_update(struct r600_pipe_context *rctx)
offset += vertex_buffer->buffer_offset + r600_bo_offset(rbuffer->bo);
if (rctx->family >= CHIP_CEDAR) {
- evergreen_pipe_add_vertex_attrib(rctx, rstate, i,
- rbuffer, offset,
- vertex_buffer->stride);
+ evergreen_pipe_set_buffer_resource(rctx, rstate, rbuffer, offset, vertex_buffer->stride);
+ evergreen_context_pipe_state_set_fs_resource(&rctx->ctx, rstate, i);
} else {
- r600_pipe_add_vertex_attrib(rctx, rstate, i,
- rbuffer, offset,
- vertex_buffer->stride);
+ r600_pipe_set_buffer_resource(rctx, rstate, rbuffer, offset, vertex_buffer->stride);
+ r600_context_pipe_state_set_fs_resource(&rctx->ctx, rstate, i);
}
}
}