[Mesa-dev] [PATCH v2 17/24] nvc0/ir: fix 1D arrays images for Kepler

[Ilia Mirkin]

Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

On Mon, Apr 25, 2016 at 4:15 PM, Samuel Pitoiset
<samuel.pitoiset at gmail.com> wrote:
> For 1D arrays, the array index is stored in the Z component.
>
> v2: simplify logic
>
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
> ---
>  src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
> index c519ea9..1f26a03 100644
> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
> @@ -1629,13 +1629,20 @@ NVC0LoweringPass::processSurfaceCoordsNVE4(TexInstruction *su)
>
>     // calculate clamped coordinates
>     for (c = 0; c < arg; ++c) {
> +      int dimc = c;
> +
> +      if (c == 1 && su->tex.target == TEX_TARGET_1D_ARRAY) {
> +         // The array index is stored in the Z component for 1D arrays.
> +         dimc = 2;
> +      }
> +
>        src[c] = bld.getScratch();
>        if (c == 0 && raw)
>           v = loadSuInfo32(NULL, base + NVE4_SU_INFO_RAW_X);
>        else
> -         v = loadSuInfo32(NULL, base + NVE4_SU_INFO_DIM(c));
> +         v = loadSuInfo32(NULL, base + NVE4_SU_INFO_DIM(dimc));
>        bld.mkOp3(OP_SUCLAMP, TYPE_S32, src[c], su->getSrc(c), v, zero)
> -         ->subOp = getSuClampSubOp(su, c);
> +         ->subOp = getSuClampSubOp(su, dimc);
>     }
>     for (; c < 3; ++c)
>        src[c] = zero;
> --
> 2.8.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev