diff options
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_draw_arrays.c | 11 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_state_so.c | 8 |
2 files changed, 8 insertions, 11 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_draw_arrays.c b/src/gallium/drivers/llvmpipe/lp_draw_arrays.c index 2efe3ef5bb8..3ce3d478290 100644 --- a/src/gallium/drivers/llvmpipe/lp_draw_arrays.c +++ b/src/gallium/drivers/llvmpipe/lp_draw_arrays.c @@ -99,16 +99,6 @@ llvmpipe_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info) info->index_size, available_space); } - for (i = 0; i < lp->num_so_targets; i++) { - void *buf = 0; - if (lp->so_targets[i]) { - buf = llvmpipe_resource(lp->so_targets[i]->target.buffer)->data; - lp->so_targets[i]->mapping = buf; - } - } - draw_set_mapped_so_targets(draw, lp->num_so_targets, - lp->so_targets); - llvmpipe_prepare_vertex_sampling(lp, lp->num_sampler_views[PIPE_SHADER_VERTEX], lp->sampler_views[PIPE_SHADER_VERTEX]); @@ -137,7 +127,6 @@ llvmpipe_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info) if (mapped_indices) { draw_set_indexes(draw, NULL, 0, 0); } - draw_set_mapped_so_targets(draw, 0, NULL); if (lp->gs && lp->gs->no_tokens) { /* we have attached stream output to the vs for rendering, diff --git a/src/gallium/drivers/llvmpipe/lp_state_so.c b/src/gallium/drivers/llvmpipe/lp_state_so.c index b2afd6fbf70..0fd38c17e50 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_so.c +++ b/src/gallium/drivers/llvmpipe/lp_state_so.c @@ -85,12 +85,20 @@ llvmpipe_set_so_targets(struct pipe_context *pipe, if (!append && llvmpipe->so_targets[i]) { llvmpipe->so_targets[i]->internal_offset = offsets[i]; } + + if (targets[i]) { + void *buf = llvmpipe_resource(targets[i]->buffer)->data; + llvmpipe->so_targets[i]->mapping = buf; + } } for (; i < llvmpipe->num_so_targets; i++) { pipe_so_target_reference((struct pipe_stream_output_target **)&llvmpipe->so_targets[i], NULL); } llvmpipe->num_so_targets = num_targets; + + draw_set_mapped_so_targets(llvmpipe->draw, llvmpipe->num_so_targets, + llvmpipe->so_targets); } void |