diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-12-23 13:27:37 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-12-23 13:27:37 +0000 |
| commit | 5f7540fe56d9bd78811acbd834be64d07862b5a5 (patch) | |
| tree | a88beb5592749f9418634348467950aeaf1f9d01 /lib/mesa/src/gallium/auxiliary/nir | |
| parent | 2f35ab22e92c7e0d9211cd62d9e57904c69940a0 (diff) | |
Import Mesa 11.0.8
This seems to fix some of the problems with clutter/gnome reported to
occur on r600 with 11.0.6
Diffstat (limited to 'lib/mesa/src/gallium/auxiliary/nir')
| -rw-r--r-- | lib/mesa/src/gallium/auxiliary/nir/tgsi_to_nir.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/mesa/src/gallium/auxiliary/nir/tgsi_to_nir.c b/lib/mesa/src/gallium/auxiliary/nir/tgsi_to_nir.c index 93dfb8033..14370e26d 100644 --- a/lib/mesa/src/gallium/auxiliary/nir/tgsi_to_nir.c +++ b/lib/mesa/src/gallium/auxiliary/nir/tgsi_to_nir.c @@ -1087,6 +1087,11 @@ ttn_tex(struct ttn_compile *c, nir_alu_dest dest, nir_ssa_def **src) op = nir_texop_tex; num_srcs = 1; break; + case TGSI_OPCODE_TEX2: + op = nir_texop_tex; + num_srcs = 1; + samp = 2; + break; case TGSI_OPCODE_TXP: op = nir_texop_tex; num_srcs = 2; @@ -1242,10 +1247,12 @@ ttn_tex(struct ttn_compile *c, nir_alu_dest dest, nir_ssa_def **src) } if (instr->is_shadow) { - if (instr->coord_components < 3) - instr->src[src_number].src = nir_src_for_ssa(ttn_channel(b, src[0], Z)); - else + if (instr->coord_components == 4) + instr->src[src_number].src = nir_src_for_ssa(ttn_channel(b, src[1], X)); + else if (instr->coord_components == 3) instr->src[src_number].src = nir_src_for_ssa(ttn_channel(b, src[0], W)); + else + instr->src[src_number].src = nir_src_for_ssa(ttn_channel(b, src[0], Z)); instr->src[src_number].src_type = nir_tex_src_comparitor; src_number++; @@ -1651,6 +1658,7 @@ ttn_emit_instruction(struct ttn_compile *c) case TGSI_OPCODE_TXL: case TGSI_OPCODE_TXB: case TGSI_OPCODE_TXD: + case TGSI_OPCODE_TEX2: case TGSI_OPCODE_TXL2: case TGSI_OPCODE_TXB2: case TGSI_OPCODE_TXQ_LZ: |