diff options
Diffstat (limited to 'src/gallium/drivers/r600')
| -rw-r--r-- | src/gallium/drivers/r600/r600.h | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_hw_context.c | 8 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_shader.c | 46 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_state_common.c | 2 |
5 files changed, 19 insertions, 42 deletions
diff --git a/src/gallium/drivers/r600/r600.h b/src/gallium/drivers/r600/r600.h index 4bfb5a980f1..baf09c1d8aa 100644 --- a/src/gallium/drivers/r600/r600.h +++ b/src/gallium/drivers/r600/r600.h @@ -196,7 +196,7 @@ struct r600_so_target { /* The buffer where BUFFER_FILLED_SIZE is stored. */ struct r600_resource *filled_size; - unsigned stride; + unsigned stride_in_dw; unsigned so_index; }; @@ -248,7 +248,7 @@ struct r600_context { struct r600_so_target *so_targets[PIPE_MAX_SO_BUFFERS]; boolean streamout_start; unsigned streamout_append_bitmask; - unsigned *vs_shader_so_strides; + unsigned *vs_so_stride_in_dw; }; struct r600_draw { diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c index b0a28d98215..ac90011dbe7 100644 --- a/src/gallium/drivers/r600/r600_hw_context.c +++ b/src/gallium/drivers/r600/r600_hw_context.c @@ -2033,7 +2033,7 @@ static void r600_set_streamout_enable(struct r600_context *ctx, unsigned buffer_ void r600_context_streamout_begin(struct r600_context *ctx) { struct r600_so_target **t = ctx->so_targets; - unsigned *strides = ctx->vs_shader_so_strides; + unsigned *stride_in_dw = ctx->vs_so_stride_in_dw; unsigned buffer_en, i, update_flags = 0; buffer_en = (ctx->num_so_targets >= 1 && t[0] ? 1 : 0) | @@ -2064,7 +2064,7 @@ void r600_context_streamout_begin(struct r600_context *ctx) for (i = 0; i < ctx->num_so_targets; i++) { if (t[i]) { - t[i]->stride = strides[i]; + t[i]->stride_in_dw = stride_in_dw[i]; t[i]->so_index = i; update_flags |= SURFACE_BASE_UPDATE_STRMOUT(i); @@ -2074,7 +2074,7 @@ void r600_context_streamout_begin(struct r600_context *ctx) 16*i - R600_CONTEXT_REG_OFFSET) >> 2; ctx->pm4[ctx->pm4_cdwords++] = (t[i]->b.buffer_offset + t[i]->b.buffer_size) >> 2; /* BUFFER_SIZE (in DW) */ - ctx->pm4[ctx->pm4_cdwords++] = strides[i] >> 2; /* VTX_STRIDE (in DW) */ + ctx->pm4[ctx->pm4_cdwords++] = stride_in_dw[i]; /* VTX_STRIDE (in DW) */ ctx->pm4[ctx->pm4_cdwords++] = 0; /* BUFFER_BASE */ ctx->pm4[ctx->pm4_cdwords++] = PKT3(PKT3_NOP, 0, 0); @@ -2186,7 +2186,7 @@ void r600_context_draw_opaque_count(struct r600_context *ctx, struct r600_so_tar ctx->pm4[ctx->pm4_cdwords++] = PKT3(PKT3_SET_CONTEXT_REG, 1, 0); ctx->pm4[ctx->pm4_cdwords++] = (R_028B30_VGT_STRMOUT_DRAW_OPAQUE_VERTEX_STRIDE - R600_CONTEXT_REG_OFFSET) >> 2; - ctx->pm4[ctx->pm4_cdwords++] = t->stride >> 2; + ctx->pm4[ctx->pm4_cdwords++] = t->stride_in_dw; ctx->pm4[ctx->pm4_cdwords++] = PKT3(PKT3_COPY_DW, 4, 0); ctx->pm4[ctx->pm4_cdwords++] = COPY_DW_SRC_IS_MEM | COPY_DW_DST_IS_REG; diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index bd782438354..45bb4da8c2a 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -147,7 +147,6 @@ struct r600_pipe_shader { struct tgsi_token *tokens; unsigned sprite_coord_enable; struct pipe_stream_output_info so; - unsigned so_strides[4]; }; struct r600_pipe_sampler_state { diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c index 6121a43c763..6fd058069c1 100644 --- a/src/gallium/drivers/r600/r600_shader.c +++ b/src/gallium/drivers/r600/r600_shader.c @@ -124,12 +124,14 @@ int r600_pipe_shader_create(struct pipe_context *ctx, struct r600_pipe_shader *s unsigned i; fprintf(stderr, "STREAMOUT\n"); for (i = 0; i < shader->so.num_outputs; i++) { + unsigned mask = ((1 << shader->so.output[i].num_components) - 1) << + shader->so.output[i].start_component; fprintf(stderr, " %i: MEM_STREAM0_BUF%i OUT[%i].%s%s%s%s\n", i, shader->so.output[i].output_buffer, shader->so.output[i].register_index, - shader->so.output[i].register_mask & 1 ? "x" : "_", - (shader->so.output[i].register_mask >> 1) & 1 ? "y" : "_", - (shader->so.output[i].register_mask >> 2) & 1 ? "z" : "_", - (shader->so.output[i].register_mask >> 3) & 1 ? "w" : "_"); + mask & 1 ? "x" : "_", + (mask >> 1) & 1 ? "y" : "_", + (mask >> 2) & 1 ? "z" : "_", + (mask >> 3) & 1 ? "w" : "_"); } } } @@ -863,11 +865,8 @@ static int r600_shader_from_tgsi(struct r600_pipe_context * rctx, struct r600_pi /* Add stream outputs. */ if (ctx.type == TGSI_PROCESSOR_VERTEX && so.num_outputs) { - unsigned buffer_offset[PIPE_MAX_SO_BUFFERS] = {0}; - for (i = 0; i < so.num_outputs; i++) { struct r600_bytecode_output output; - unsigned comps; if (so.output[i].output_buffer >= 4) { R600_ERR("exceeded the max number of stream output buffers, got: %d\n", @@ -875,36 +874,21 @@ static int r600_shader_from_tgsi(struct r600_pipe_context * rctx, struct r600_pi r = -EINVAL; goto out_err; } - - switch (so.output[i].register_mask) { - case TGSI_WRITEMASK_XYZW: - comps = 4; - break; - case TGSI_WRITEMASK_XYZ: - comps = 3; - break; - case TGSI_WRITEMASK_XY: - comps = 2; - break; - case TGSI_WRITEMASK_X: - comps = 1; - break; - default: - R600_ERR("streamout: invalid register_mask, got: %x\n", - so.output[i].register_mask); - r = -EINVAL; - goto out_err; + if (so.output[i].start_component) { + R600_ERR("stream_output - start_component cannot be non-zero\n"); + r = -EINVAL; + goto out_err; } memset(&output, 0, sizeof(struct r600_bytecode_output)); output.gpr = shader->output[so.output[i].register_index].gpr; output.elem_size = 0; - output.array_base = buffer_offset[so.output[i].output_buffer]; + output.array_base = so.output[i].dst_offset; output.type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_WRITE; output.burst_count = 1; output.barrier = 1; output.array_size = 0; - output.comp_mask = so.output[i].register_mask; + output.comp_mask = (1 << so.output[i].num_components) - 1; if (ctx.bc->chip_class >= EVERGREEN) { switch (so.output[i].output_buffer) { case 0: @@ -939,12 +923,6 @@ static int r600_shader_from_tgsi(struct r600_pipe_context * rctx, struct r600_pi r = r600_bytecode_add_output(ctx.bc, &output); if (r) goto out_err; - - buffer_offset[so.output[i].output_buffer] += comps; - } - - for (i = 0; i < PIPE_MAX_SO_BUFFERS; i++) { - pipeshader->so_strides[i] = buffer_offset[i] * 4; } } diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c index 034a560a7ec..ac9bd27df24 100644 --- a/src/gallium/drivers/r600/r600_state_common.c +++ b/src/gallium/drivers/r600/r600_state_common.c @@ -649,7 +649,7 @@ void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *dinfo) } } - rctx->ctx.vs_shader_so_strides = rctx->vs_shader->so_strides; + rctx->ctx.vs_so_stride_in_dw = rctx->vs_shader->so.stride; mask = (1ULL << ((unsigned)rctx->framebuffer.nr_cbufs * 4)) - 1; |