From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Sun, 21 Nov 2021 00:17:43 +0000 (-0500)
Subject: freedreno/ir3: get the post-lowering clip/cull mask
X-Git-Tag: upstream/22.3.5~15313
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f533d7a4466987561095158f3762ba557e6fd7a4;p=platform%2Fupstream%2Fmesa.git

freedreno/ir3: get the post-lowering clip/cull mask

The variant may include a lowered gl_Clip/CullDistance array. So we have
to use the variant's info (which is not available). However we save off
the clip/cull masks already, so just reuse those.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13891>
---

diff --git a/src/freedreno/ir3/ir3_compiler_nir.c b/src/freedreno/ir3/ir3_compiler_nir.c
index 05c9372..bb4b627 100644
--- a/src/freedreno/ir3/ir3_compiler_nir.c
+++ b/src/freedreno/ir3/ir3_compiler_nir.c
@@ -3573,10 +3573,7 @@ pack_inlocs(struct ir3_context *ctx)
     * use the NIR clip/cull distances to avoid reading ucp_enables in the
     * shader key.
     */
-   unsigned clip_cull_size =
-      ctx->so->shader->nir->info.clip_distance_array_size +
-      ctx->so->shader->nir->info.cull_distance_array_size;
-   unsigned clip_cull_mask = MASK(clip_cull_size);
+   unsigned clip_cull_mask = so->clip_mask | so->cull_mask;
 
    for (unsigned i = 0; i < so->inputs_count; i++) {
       unsigned compmask = 0, maxcomp = 0;