Mesa (master): vc4: Use a defined t value for 1D textures.

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Fri Jun 19 19:47:44 2015 -0700

vc4: Use a defined t value for 1D textures.

This doesn't fix the broken 1D cases of texsubimage, but it does prevent
segfaulting when dumping the QIR code generated in fbo-1d.

---

 src/gallium/drivers/vc4/vc4_program.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c
index bb45eb1..ba47c51 100644
--- a/src/gallium/drivers/vc4/vc4_program.c
+++ b/src/gallium/drivers/vc4/vc4_program.c
@@ -325,7 +325,9 @@ ntq_emit_tex(struct vc4_compile *c, nir_tex_instr *instr)
                 switch (instr->src[i].src_type) {
                 case nir_tex_src_coord:
                         s = ntq_get_src(c, instr->src[i].src, 0);
-                        if (instr->sampler_dim != GLSL_SAMPLER_DIM_1D)
+                        if (instr->sampler_dim == GLSL_SAMPLER_DIM_1D)
+                                t = qir_uniform_f(c, 0.5);
+                        else
                                 t = ntq_get_src(c, instr->src[i].src, 1);
                         if (instr->sampler_dim == GLSL_SAMPLER_DIM_CUBE)
                                 r = ntq_get_src(c, instr->src[i].src, 2);