From edf034ac142f2ae10befdf331b170373ff456495 Mon Sep 17 00:00:00 2001 From: Nicolai Hähnle Date: Fri, 2 Dec 2016 21:20:49 +0100 Subject: radeonsi: do not write non-existent components through the GSVS ring MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák --- src/gallium/drivers/radeonsi/si_shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/gallium/drivers') diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 441718bbee5..7324eb38a1c 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -5317,7 +5317,8 @@ static void si_llvm_emit_vertex( ctx->soa.outputs[i]; for (chan = 0; chan < 4; chan++) { - if (((info->output_streams[i] >> (2 * chan)) & 3) != stream) + if (!(info->output_usagemask[i] & (1 << chan)) || + ((info->output_streams[i] >> (2 * chan)) & 3) != stream) continue; LLVMValueRef out_val = LLVMBuildLoad(gallivm->builder, out_ptr[chan], ""); @@ -6432,7 +6433,8 @@ si_generate_gs_copy_shader(struct si_screen *sscreen, /* Fetch vertex data from GSVS ring */ for (i = 0; i < gsinfo->num_outputs; ++i) { for (unsigned chan = 0; chan < 4; chan++) { - if (outputs[i].vertex_stream[chan] != stream) { + if (!(gsinfo->output_usagemask[i] & (1 << chan)) || + outputs[i].vertex_stream[chan] != stream) { outputs[i].values[chan] = ctx.soa.bld_base.base.undef; continue; } -- cgit v1.2.3