Mesa (master): Revert "nir: assert that nir_lower_tex runs after lowering derefs"

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 50c47ba49edc525bb8bca7a95cf75d7275a21a76
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=50c47ba49edc525bb8bca7a95cf75d7275a21a76

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Jan 13 17:35:35 2020 -0800

Revert "nir: assert that nir_lower_tex runs after lowering derefs"

This reverts commit 4cda61f11e922fb5914ae73d22cc0c495abf0377 for now,
as it appears to break i965 CI (32,000+ failures).  Rob and I suspect
we need to do the equivalent of 1c6a2efa06e9bb5914f4557118930fc61065a467
on i965 - we are doing nir_lower_tex and brw_nir_lower_resources in the
wrong order and that's likely triggering this condition.  Once we fix
that, we should put this patch back.

---

 src/compiler/nir/nir_lower_tex.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/compiler/nir/nir_lower_tex.c b/src/compiler/nir/nir_lower_tex.c
index 191076f8c27..6c8c6aa1164 100644
--- a/src/compiler/nir/nir_lower_tex.c
+++ b/src/compiler/nir/nir_lower_tex.c
@@ -934,12 +934,6 @@ nir_lower_tex_block(nir_block *block, nir_builder *b,
       nir_tex_instr *tex = nir_instr_as_tex(instr);
       bool lower_txp = !!(options->lower_txp & (1 << tex->sampler_dim));
 
-      /* we aren't really going to do the right thing if we haven't
-       * lowered tex/samp derefs yet:
-       */
-      assume(nir_tex_instr_src_index(tex, nir_tex_src_texture_deref) < 0);
-      assume(nir_tex_instr_src_index(tex, nir_tex_src_sampler_deref) < 0);
-
       /* mask of src coords to saturate (clamp): */
       unsigned sat_mask = 0;