summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/r600/r600_shader.c
diff options
context:
space:
mode:
authorBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>2010-05-19 18:46:45 +0200
committerJerome Glisse <jglisse@redhat.com>2010-05-27 23:24:22 +0200
commit9e8a6f801d360f85cc7bb53b85f15129b07b26da (patch)
tree12d5d3bd39ece8e88fa4016bfe815e09607583ff /src/gallium/drivers/r600/r600_shader.c
parente68b4e50536b3438a3bb8c3d12acebc6845461a8 (diff)
r600g: various fixes
- enabled flushing a buffer more than once - enabled the blitter for r600_clear - added some more colors to r600_is_format_supported (copied from r600_conv_pipe_format) - r600_set_framebuffer_state now sets rctx->fb_state - more states are saved before a blit (had to add some accounting for the viewport and the vertex elements state) - fixed a few errors with reference counting
Diffstat (limited to 'src/gallium/drivers/r600/r600_shader.c')
-rw-r--r--src/gallium/drivers/r600/r600_shader.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index f8a18658a9..e8efdc9db3 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -200,8 +200,8 @@ int r600_pipe_shader_update(struct pipe_context *ctx, struct r600_pipe_shader *r
rshader = &rpshader->shader;
switch (rpshader->type) {
case C_PROGRAM_TYPE_VS:
- for (i = 0; i < rctx->nvertex_element; i++) {
- resource_format[nresources++] = rctx->vertex_element[i].src_format;
+ for (i = 0; i < rctx->vertex_elements->count; i++) {
+ resource_format[nresources++] = rctx->vertex_elements->elements[i].src_format;
}
break;
default: