diff options
| author | Eric Anholt <eric@anholt.net> | 2015-06-23 11:02:12 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2015-06-23 18:40:50 -0700 |
| commit | e70f5617f1125e1f39a75d7a8c92ddda86a8056d (patch) | |
| tree | efbc98b125f19a432ca288956c9194c4549a0d9c /src/gallium/auxiliary/nir/tgsi_to_nir.c | |
| parent | 6844d6b7f8398a25eff511541b187afeb1199ce0 (diff) | |
| download | external_mesa3d-e70f5617f1125e1f39a75d7a8c92ddda86a8056d.zip external_mesa3d-e70f5617f1125e1f39a75d7a8c92ddda86a8056d.tar.gz external_mesa3d-e70f5617f1125e1f39a75d7a8c92ddda86a8056d.tar.bz2 | |
tgsi_to_nir: Fix translation of TXF on MSAA targets.
Noticed while trying to add GL_ARB_texture_multisample support to vc4.
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Diffstat (limited to 'src/gallium/auxiliary/nir/tgsi_to_nir.c')
| -rw-r--r-- | src/gallium/auxiliary/nir/tgsi_to_nir.c | 12 |
1 files 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++; } |