Mesa (main): broadcom/compiler: emit passthrough Z write if shader reads Z

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 6d4a645c90a8d94534a52d20ff206d0f94c5be5e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6d4a645c90a8d94534a52d20ff206d0f94c5be5e

Author: Iago Toral Quiroga <itoral at igalia.com>
Date:   Thu Dec  2 11:18:13 2021 +0100

broadcom/compiler: emit passthrough Z write if shader reads Z

Reviewed-by: Alejandro Piñeiro <apinheiro at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14037>

---

 src/broadcom/compiler/nir_to_vir.c   | 21 ++++++++++++++++++---
 src/broadcom/compiler/v3d_compiler.h |  1 +
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/broadcom/compiler/nir_to_vir.c b/src/broadcom/compiler/nir_to_vir.c
index b5ca46ee484..028c3805103 100644
--- a/src/broadcom/compiler/nir_to_vir.c
+++ b/src/broadcom/compiler/nir_to_vir.c
@@ -1711,8 +1711,17 @@ emit_frag_end(struct v3d_compile *c)
          * disabled when needed (Z writes from shader, discards, etc), by
          * setting c->writes_z to True, in which case, the QPUs need to write
          * the Z value.
+         *
+         * Also, from the V3D 4.2 spec:
+         *
+         * "If a shader performs a Z read the “Fragment shader does Z writes”
+         *  bit in the shader record must be enabled to ensure deterministic
+         *  results"
+         *
+         * So if c->reads_z is set we always need to write Z, even if it is
+         * a passthrough from the Z value produced from FEP.
          */
-        if (!c->s->info.fs.early_fragment_tests) {
+        if (!c->s->info.fs.early_fragment_tests || c->reads_z) {
                 c->writes_z = true;
                 uint8_t tlb_specifier = TLB_TYPE_DEPTH;
                 struct qinst *inst;
@@ -2452,8 +2461,14 @@ ntq_emit_load_input(struct v3d_compile *c, nir_intrinsic_instr *instr)
         } else {
                 for (int i = 0; i < instr->num_components; i++) {
                         int comp = nir_intrinsic_component(instr) + i;
-                        ntq_store_dest(c, &instr->dest, i,
-                                       vir_MOV(c, c->inputs[offset * 4 + comp]));
+                        struct qreg input = c->inputs[offset * 4 + comp];
+                        ntq_store_dest(c, &instr->dest, i, vir_MOV(c, input));
+
+                        if (c->s->info.stage == MESA_SHADER_FRAGMENT &&
+                            input.file == c->payload_z.file &&
+                            input.index == c->payload_z.index) {
+                                c->reads_z = true;
+                        }
                 }
         }
 }
diff --git a/src/broadcom/compiler/v3d_compiler.h b/src/broadcom/compiler/v3d_compiler.h
index 774632b905a..d7b2fb886b0 100644
--- a/src/broadcom/compiler/v3d_compiler.h
+++ b/src/broadcom/compiler/v3d_compiler.h
@@ -655,6 +655,7 @@ struct v3d_compile {
 
         bool uses_center_w;
         bool writes_z;
+        bool reads_z;
         bool uses_implicit_point_line_varyings;
 
         /* True if a fragment shader reads gl_PrimitiveID */