Mesa (master): v3d: Assert that we do request the normal texturing return data.

[GitLab Mirror]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Apr 25 11:23:55 2019 -0700

v3d: Assert that we do request the normal texturing return data.

An unused tex should be DCEed, but if it wasn't we'd run into trouble with
not doing a TMUWT.

---

 src/broadcom/compiler/v3d40_tex.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/broadcom/compiler/v3d40_tex.c b/src/broadcom/compiler/v3d40_tex.c
index 679f1f15f81..e5a45c1f003 100644
--- a/src/broadcom/compiler/v3d40_tex.c
+++ b/src/broadcom/compiler/v3d40_tex.c
@@ -183,6 +183,8 @@ v3d40_vir_emit_tex(struct v3d_compile *c, nir_tex_instr *instr)
         assert(p1_unpacked.output_type_32_bit ||
                p0_unpacked.return_words_of_texture_data < (1 << 2));
 
+        assert(p0_unpacked.return_words_of_texture_data != 0);
+
         uint32_t p0_packed;
         V3D41_TMU_CONFIG_PARAMETER_0_pack(NULL,
                                           (uint8_t *)&p0_packed,