Mesa (master): intel/fs: Fix unused texture coordinate zeroing on Gen4-5

[GitLab Mirror]

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

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Sun Apr 26 09:48:16 2020 -0500

intel/fs: Fix unused texture coordinate zeroing on Gen4-5

We were inserting the right number of MOVs but, thanks to the way we
advanced msg_end earlier in the function, were often writing the zeros
past the end of where we actually read in the register file.

Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5243>

---

 src/intel/compiler/brw_fs.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp
index ab97a07d0d1..3894217c045 100644
--- a/src/intel/compiler/brw_fs.cpp
+++ b/src/intel/compiler/brw_fs.cpp
@@ -4754,7 +4754,8 @@ lower_sampler_logical_send_gen4(const fs_builder &bld, fs_inst *inst, opcode op,
    if (coord_components > 0 &&
        (has_lod || shadow_c.file != BAD_FILE ||
         (op == SHADER_OPCODE_TEX && bld.dispatch_width() == 8))) {
-      for (unsigned i = coord_components; i < 3; i++)
+      assert(coord_components <= 3);
+      for (unsigned i = 0; i < 3 - coord_components; i++)
          bld.MOV(offset(msg_end, bld, i), brw_imm_f(0.0f));
 
       msg_end = offset(msg_end, bld, 3 - coord_components);