diff options
| author | Marek Olšák <[email protected]> | 2013-02-26 17:20:25 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-03-01 13:46:32 +0100 |
| commit | 6f25de6711491bbcfc906cd8804f30acc6534b2d (patch) | |
| tree | 134c428c9c15525f01187ebdffb5ee51d572587d /src/gallium/drivers/r600/r600_blit.c | |
| parent | 9dd18f43a4db73be73dfbf2e9950ae4dfaf6322e (diff) | |
r600g: atomize streamout enabling
This doesn't fix any issue we know of, but there indeed is a week spot
in draw_vbo where streamout can fail. After streamout is enabled,
the need_cs_space call can flush the context, which causes the streamout
to be disabled right after it was enabled and bad things happen.
One way to fix it is to atomize the beginning part, so that no context flush
can happen between streamout enabling and the first drawing.
Tested-by: Andreas Boll <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_blit.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_blit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c index 3e0d89c06f0..c737aa25c43 100644 --- a/src/gallium/drivers/r600/r600_blit.c +++ b/src/gallium/drivers/r600/r600_blit.c @@ -58,8 +58,8 @@ static void r600_blitter_begin(struct pipe_context *ctx, enum r600_blitter_op op util_blitter_save_vertex_buffer_slot(rctx->blitter, rctx->vertex_buffer_state.vb); util_blitter_save_vertex_elements(rctx->blitter, rctx->vertex_fetch_shader.cso); util_blitter_save_vertex_shader(rctx->blitter, rctx->vs_shader); - util_blitter_save_so_targets(rctx->blitter, rctx->num_so_targets, - (struct pipe_stream_output_target**)rctx->so_targets); + util_blitter_save_so_targets(rctx->blitter, rctx->streamout.num_targets, + (struct pipe_stream_output_target**)rctx->streamout.targets); util_blitter_save_rasterizer(rctx->blitter, rctx->rasterizer_state.cso); if (op & R600_SAVE_FRAGMENT_STATE) { |