diff options
| author | Marek Olšák <[email protected]> | 2012-02-02 15:04:13 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-02-16 15:56:59 +0100 |
| commit | 73191026b4198a3dce86dac015f973616f76363a (patch) | |
| tree | 7838a37d485740b810e4bf5c38b2faf4b16ec8b7 | |
| parent | 709f50928e1d4df755ffb90ec9f33ba6c9605a32 (diff) | |
r600g: remove redundant r600_context::vs_so_stride_in_dw
| -rw-r--r-- | src/gallium/drivers/r600/r600_hw_context.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_state_common.c | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c index ab51b3e4c43..1de345c92d1 100644 --- a/src/gallium/drivers/r600/r600_hw_context.c +++ b/src/gallium/drivers/r600/r600_hw_context.c @@ -1931,7 +1931,7 @@ void r600_context_streamout_begin(struct r600_context *ctx) { struct radeon_winsys_cs *cs = ctx->cs; struct r600_so_target **t = ctx->so_targets; - unsigned *stride_in_dw = ctx->vs_so_stride_in_dw; + unsigned *stride_in_dw = ctx->vs_shader->so.stride; unsigned buffer_en, i, update_flags = 0; uint64_t va; diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index bfa2fb1ebe6..33b0e27d26a 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -314,7 +314,6 @@ struct r600_context { struct r600_so_target *so_targets[PIPE_MAX_SO_BUFFERS]; boolean streamout_start; unsigned streamout_append_bitmask; - unsigned *vs_so_stride_in_dw; }; static INLINE void r600_emit_atom(struct r600_context *rctx, struct r600_atom *atom) diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c index 561e0995afa..a20d3b3c2fe 100644 --- a/src/gallium/drivers/r600/r600_state_common.c +++ b/src/gallium/drivers/r600/r600_state_common.c @@ -815,8 +815,6 @@ void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *dinfo) } } - rctx->vs_so_stride_in_dw = rctx->vs_shader->so.stride; - mask = (1ULL << ((unsigned)rctx->framebuffer.nr_cbufs * 4)) - 1; if (rctx->vgt.id != R600_PIPE_STATE_VGT) { |