diff options
| -rw-r--r-- | src/gallium/drivers/r600/r600_shader.c | 10 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_state_common.c | 7 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c index 0a9f55a94a0..3535a134715 100644 --- a/src/gallium/drivers/r600/r600_shader.c +++ b/src/gallium/drivers/r600/r600_shader.c @@ -1162,7 +1162,7 @@ static int generate_gs_copy_shader(struct r600_context *rctx, struct r600_bytecode_output output; struct r600_bytecode_cf *cf_jump, *cf_pop, *last_exp_pos = NULL, *last_exp_param = NULL; - int i, next_clip_pos = 62, next_param = 0; + int i, next_clip_pos = 61, next_param = 0; cshader = calloc(1, sizeof(struct r600_pipe_shader)); if (!cshader) @@ -1263,18 +1263,26 @@ static int generate_gs_copy_shader(struct r600_context *rctx, case TGSI_SEMANTIC_PSIZE: output.array_base = 61; + if (next_clip_pos == 61) + next_clip_pos = 62; output.type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_POS; output.swizzle_y = 7; output.swizzle_z = 7; output.swizzle_w = 7; + ctx.shader->vs_out_misc_write = 1; + ctx.shader->vs_out_point_size = 1; break; case TGSI_SEMANTIC_LAYER: output.array_base = 61; + if (next_clip_pos == 61) + next_clip_pos = 62; output.type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_POS; output.swizzle_x = 7; output.swizzle_y = 7; output.swizzle_z = 0; output.swizzle_w = 7; + ctx.shader->vs_out_misc_write = 1; + ctx.shader->vs_out_layer = 1; break; case TGSI_SEMANTIC_CLIPDIST: /* spi_sid is 0 for clipdistance outputs that were generated diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c index f237d26c376..ffa1eb0c490 100644 --- a/src/gallium/drivers/r600/r600_state_common.c +++ b/src/gallium/drivers/r600/r600_state_common.c @@ -1171,6 +1171,13 @@ static bool r600_update_derived_state(struct r600_context *rctx) if (unlikely(rctx->geometry_shader.shader != rctx->gs_shader->current)) { update_shader_atom(ctx, &rctx->geometry_shader, rctx->gs_shader->current); update_shader_atom(ctx, &rctx->vertex_shader, rctx->gs_shader->current->gs_copy_shader); + /* Update clip misc state. */ + if (rctx->gs_shader->current->gs_copy_shader->pa_cl_vs_out_cntl != rctx->clip_misc_state.pa_cl_vs_out_cntl || + rctx->gs_shader->current->gs_copy_shader->shader.clip_dist_write != rctx->clip_misc_state.clip_dist_write) { + rctx->clip_misc_state.pa_cl_vs_out_cntl = rctx->gs_shader->current->gs_copy_shader->pa_cl_vs_out_cntl; + rctx->clip_misc_state.clip_dist_write = rctx->gs_shader->current->gs_copy_shader->shader.clip_dist_write; + rctx->clip_misc_state.atom.dirty = true; + } } r600_shader_select(ctx, rctx->vs_shader, &vs_dirty); |