Mesa (master): panfrost/midgard: Apply writemask to LUTs

[GitLab Mirror]

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

Author: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Date:   Mon Jun 17 11:49:44 2019 -0700

panfrost/midgard: Apply writemask to LUTs

Fixes LUT instructions with NIR registers.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>

---

 src/gallium/drivers/panfrost/ci/expected-failures.txt  | 2 --
 src/gallium/drivers/panfrost/midgard/midgard_compile.c | 9 ++++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/panfrost/ci/expected-failures.txt b/src/gallium/drivers/panfrost/ci/expected-failures.txt
index 66ca0507cc3..98632faaac7 100644
--- a/src/gallium/drivers/panfrost/ci/expected-failures.txt
+++ b/src/gallium/drivers/panfrost/ci/expected-failures.txt
@@ -307,8 +307,6 @@ dEQP-GLES2.functional.shaders.random.all_features.fragment.72
 dEQP-GLES2.functional.shaders.random.all_features.fragment.77
 dEQP-GLES2.functional.shaders.random.all_features.vertex.0
 dEQP-GLES2.functional.shaders.random.all_features.vertex.17
-dEQP-GLES2.functional.shaders.random.exponential.fragment.46
-dEQP-GLES2.functional.shaders.random.exponential.vertex.46
 dEQP-GLES2.functional.shaders.random.texture.vertex.10
 dEQP-GLES2.functional.shaders.random.texture.vertex.11
 dEQP-GLES2.functional.shaders.random.texture.vertex.12
diff --git a/src/gallium/drivers/panfrost/midgard/midgard_compile.c b/src/gallium/drivers/panfrost/midgard/midgard_compile.c
index cfb17572b35..47742a5a7a9 100644
--- a/src/gallium/drivers/panfrost/midgard/midgard_compile.c
+++ b/src/gallium/drivers/panfrost/midgard/midgard_compile.c
@@ -985,7 +985,14 @@ emit_alu(compiler_context *ctx, nir_alu_instr *instr)
                 memcpy(original_swizzle, nirmods[0]->swizzle, sizeof(nirmods[0]->swizzle));
 
                 for (int i = 0; i < nr_components; ++i) {
-                        ins.alu.mask = (0x3) << (2 * i); /* Mask the associated component */
+                        /* Mask the associated component, dropping the
+                         * instruction if needed */
+
+                        ins.alu.mask = (0x3) << (2 * i);
+                        ins.alu.mask &= alu.mask;
+
+                        if (!ins.alu.mask)
+                                continue;
 
                         for (int j = 0; j < 4; ++j)
                                 nirmods[0]->swizzle[j] = original_swizzle[i]; /* Pull from the correct component */