diff options
| author | Michal Krol <michal@vmware.com> | 2010-01-14 18:11:41 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2010-01-14 18:11:41 +0100 |
| commit | 5184b02b0793136a15b7edf309d79a1efe1bc73d (patch) | |
| tree | 939f7f87f623b0651e31ea84131c00630ae19f12 /src/gallium/drivers/svga/svga_state_vs.c | |
| parent | 1bc77e9931a248b74e0ef6b6aa2f4c5b2d1a2ca3 (diff) | |
| parent | ea0cc47a4f769e19ceadb9704669244f5ba53871 (diff) | |
Merge branch 'instanced-arrays'
Conflicts:
src/gallium/drivers/softpipe/sp_draw_arrays.c
Diffstat (limited to 'src/gallium/drivers/svga/svga_state_vs.c')
| -rw-r--r-- | src/gallium/drivers/svga/svga_state_vs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/drivers/svga/svga_state_vs.c b/src/gallium/drivers/svga/svga_state_vs.c index ae1e77e7d4..fef652c0c0 100644 --- a/src/gallium/drivers/svga/svga_state_vs.c +++ b/src/gallium/drivers/svga/svga_state_vs.c @@ -200,10 +200,12 @@ static int update_zero_stride( struct svga_context *svga, key.output_stride = 4 * sizeof(float); key.nr_elements = 1; + key.element[0].type = TRANSLATE_ELEMENT_NORMAL; key.element[0].input_format = vel->src_format; key.element[0].output_format = PIPE_FORMAT_R32G32B32A32_FLOAT; key.element[0].input_buffer = vel->vertex_buffer_index; key.element[0].input_offset = vel->src_offset; + key.element[0].instance_divisor = vel->instance_divisor; key.element[0].output_offset = const_idx * 4 * sizeof(float); translate_key_sanitize(&key); @@ -222,7 +224,7 @@ static int update_zero_stride( struct svga_context *svga, translate->set_buffer(translate, vel->vertex_buffer_index, mapped_buffer, vbuffer->stride); - translate->run(translate, 0, 1, + translate->run(translate, 0, 1, 0, svga->curr.zero_stride_constants); pipe_buffer_unmap(svga->pipe.screen, |