Module: Mesa Branch: 10.2 Commit: 76e112380a4a4595f2fec49070f1d942994d15f0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=76e112380a4a4595f2fec49070f1d942994d15f0
Author: Ilia Mirkin <[email protected]> Date: Fri May 23 11:31:39 2014 -0400 nvc0: revert mistaken logic to collapse color outputs to the beginning In commit af38ef907, I added a "fix" to color outputs not being assigned correctly when sample mask was being output. This was totally wrong -- the color indices (i.e. "si" values) were the ones that were wrong. Undo that hunk. Signed-off-by: Ilia Mirkin <[email protected]> Acked-by: Emil Velikov <[email protected]> (cherry picked from commit 0d699530ff9fe68a1898f875b889422536bfc8e5) Requested-by: Ilia Mirkin <[email protected]> --- src/gallium/drivers/nouveau/nvc0/nvc0_program.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_program.c b/src/gallium/drivers/nouveau/nvc0/nvc0_program.c index 1d59fc4..394e4a3 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_program.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_program.c @@ -133,17 +133,12 @@ static int nvc0_fp_assign_output_slots(struct nv50_ir_prog_info *info) { unsigned count = info->prop.fp.numColourResults * 4; - unsigned i, c, ci; + unsigned i, c; - for (i = 0, ci = 0; i < info->numOutputs; ++i) { - if (info->out[i].sn == TGSI_SEMANTIC_COLOR) { + for (i = 0; i < info->numOutputs; ++i) + if (info->out[i].sn == TGSI_SEMANTIC_COLOR) for (c = 0; c < 4; ++c) - info->out[i].slot[c] = ci * 4 + c; - ci++; - } - } - - assert(ci == info->prop.fp.numColourResults); + info->out[i].slot[c] = info->out[i].si * 4 + c; if (info->io.sampleMask < PIPE_MAX_SHADER_OUTPUTS) info->out[info->io.sampleMask].slot[0] = count++; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
