[Mesa-dev] [PATCH] nvc0: collapse output slots to have adjacent registers

[Karol Herbst]

Tested-By: Karol Herbst <kherbst at redhat.com>

On Mon, Feb 5, 2018 at 6:15 AM, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
> The hardware skips over unallocated slots, so we have to make sure those
> registers are packed together.
>
> Fixes KHR-GL45.enhanced_layouts.fragment_data_location_api
>
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
>
> Tested on GK208. Needs testing on Fermi, as I seem to recall it had
> slightly different semantics from Kepler. They might need slightly
> different logic.
>
>  src/gallium/drivers/nouveau/nvc0/nvc0_program.c | 14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_program.c b/src/gallium/drivers/nouveau/nvc0/nvc0_program.c
> index e6157f550d6..9520d984bb3 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_program.c
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_program.c
> @@ -134,10 +134,20 @@ nvc0_fp_assign_output_slots(struct nv50_ir_prog_info *info)
>     unsigned count = info->prop.fp.numColourResults * 4;
>     unsigned i, c;
>
> +   /* Compute the relative position of each color output, since skipped MRT
> +    * positions will not have registers allocated to them.
> +    */
> +   unsigned colors[8] = {0};
> +   for (i = 0; i < info->numOutputs; ++i)
> +      if (info->out[i].sn == TGSI_SEMANTIC_COLOR)
> +         colors[info->out[i].si] = 1;
> +   for (i = 0, c = 0; i < 8; i++)
> +      if (colors[i])
> +         colors[i] = c++;
>     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] = info->out[i].si * 4 + c;
> +            info->out[i].slot[c] = colors[info->out[i].si] * 4 + c;
>
>     if (info->io.sampleMask < PIPE_MAX_SHADER_OUTPUTS)
>        info->out[info->io.sampleMask].slot[0] = count++;
> @@ -474,7 +484,7 @@ nvc0_fp_gen_header(struct nvc0_program *fp, struct nv50_ir_prog_info *info)
>
>     for (i = 0; i < info->numOutputs; ++i) {
>        if (info->out[i].sn == TGSI_SEMANTIC_COLOR)
> -         fp->hdr[18] |= 0xf << info->out[i].slot[0];
> +         fp->hdr[18] |= 0xf << (4 * info->out[i].si);
>     }
>
>     /* There are no "regular" attachments, but the shader still needs to be
> --
> 2.13.6
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev