[Mesa-dev] [PATCH] tgsi_to_nir: Fix translation of TXF on MSAA targets.

[Ilia Mirkin]

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

On Tue, Jun 23, 2015 at 2:04 PM, Eric Anholt <eric at anholt.net> wrote:
> Noticed while trying to add GL_ARB_texture_multisample support to vc4.
> ---
>  src/gallium/auxiliary/nir/tgsi_to_nir.c | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c
> index 061f39a..065bbf0 100644
> --- a/src/gallium/auxiliary/nir/tgsi_to_nir.c
> +++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c
> @@ -1078,7 +1078,12 @@ ttn_tex(struct ttn_compile *c, nir_alu_dest dest, nir_ssa_def **src)
>        samp = 2;
>        break;
>     case TGSI_OPCODE_TXF:
> -      op = nir_texop_txf;
> +      if (tgsi_inst->Texture.Texture == TGSI_TEXTURE_2D_MSAA ||
> +          tgsi_inst->Texture.Texture == TGSI_TEXTURE_2D_ARRAY_MSAA) {
> +         op = nir_texop_txf_ms;
> +      } else {
> +         op = nir_texop_txf;
> +      }
>        num_srcs = 2;
>        break;
>     case TGSI_OPCODE_TXD:
> @@ -1178,7 +1183,10 @@ ttn_tex(struct ttn_compile *c, nir_alu_dest dest, nir_ssa_def **src)
>
>     if (tgsi_inst->Instruction.Opcode == TGSI_OPCODE_TXF) {
>        instr->src[src_number].src = nir_src_for_ssa(ttn_channel(b, src[0], W));
> -      instr->src[src_number].src_type = nir_tex_src_lod;
> +      if (op == nir_texop_txf_ms)
> +         instr->src[src_number].src_type = nir_tex_src_ms_index;
> +      else
> +         instr->src[src_number].src_type = nir_tex_src_lod;
>        src_number++;
>     }
>
> --
> 2.1.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev