Mesa (main): amd: Don't handle nir_tex_src_ms_mcs

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: a7b429e8ecbf73536ee7c6ff8d14389f35e00a8f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a7b429e8ecbf73536ee7c6ff8d14389f35e00a8f

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Fri Jul  9 08:32:01 2021 -0500

amd: Don't handle nir_tex_src_ms_mcs

It's an intel-specific texture source and will never be seen on AMD.

Reviewed-by: Alyssa Rosenzweig <alyssa at collabora.com>
Reviewed-by: Daniel Schürmann <daniel at schuermann.dev>
Reviewed-by: Connor Abbott <cwabbott0 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11775>

---

 src/amd/llvm/ac_nir_to_llvm.c                           | 2 --
 src/gallium/drivers/r600/sfn/sfn_emittexinstruction.cpp | 1 -
 2 files changed, 3 deletions(-)

diff --git a/src/amd/llvm/ac_nir_to_llvm.c b/src/amd/llvm/ac_nir_to_llvm.c
index d626da4983c..f0f22a64624 100644
--- a/src/amd/llvm/ac_nir_to_llvm.c
+++ b/src/amd/llvm/ac_nir_to_llvm.c
@@ -4331,8 +4331,6 @@ static void visit_tex(struct ac_nir_context *ctx, nir_tex_instr *instr)
       case nir_tex_src_ms_index:
          sample_index = get_src(ctx, instr->src[i].src);
          break;
-      case nir_tex_src_ms_mcs:
-         break;
       case nir_tex_src_ddx:
          ddx = get_src(ctx, instr->src[i].src);
          args.g16 = instr->src[i].src.ssa->bit_size == 16;
diff --git a/src/gallium/drivers/r600/sfn/sfn_emittexinstruction.cpp b/src/gallium/drivers/r600/sfn/sfn_emittexinstruction.cpp
index a34a10bc67b..326cd15a39d 100644
--- a/src/gallium/drivers/r600/sfn/sfn_emittexinstruction.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_emittexinstruction.cpp
@@ -586,7 +586,6 @@ bool EmitTexInstruction::get_inputs(const nir_tex_instr& instr, TexInputs &src)
       case nir_tex_src_plane:
       case nir_tex_src_projector:
       case nir_tex_src_min_lod:
-      case nir_tex_src_ms_mcs:
       default:
          sfn_log << SfnLog::tex << "Texture source type " <<  instr.src[i].src_type << " not supported\n";
          retval = false;