Mesa (master): panfrost: Inline max rt into compilers

[GitLab Mirror]

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

Author: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Date:   Wed Aug  5 18:10:41 2020 -0400

panfrost: Inline max rt into compilers

Another dep.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6196>

---

 src/panfrost/bifrost/bifrost_compile.c | 2 +-
 src/panfrost/util/pan_ir.h             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c
index ed8741ddb5a..0c7942f7e95 100644
--- a/src/panfrost/bifrost/bifrost_compile.c
+++ b/src/panfrost/bifrost/bifrost_compile.c
@@ -169,7 +169,7 @@ bi_emit_frag_out(bi_context *ctx, nir_intrinsic_instr *instr)
                 .vector_channels = 4
         };
 
-        assert(blend.blend_location < BIFROST_MAX_RENDER_TARGET_COUNT);
+        assert(blend.blend_location < 8);
         assert(ctx->blend_types);
         assert(blend.src_types[0]);
         ctx->blend_types[blend.blend_location] = blend.src_types[0];
diff --git a/src/panfrost/util/pan_ir.h b/src/panfrost/util/pan_ir.h
index 99a8e5ba70f..bf9c7b00cf8 100644
--- a/src/panfrost/util/pan_ir.h
+++ b/src/panfrost/util/pan_ir.h
@@ -87,7 +87,7 @@ typedef struct {
         int uniform_cutoff;
 
         /* For Bifrost - output type for each RT */
-        nir_alu_type blend_types[BIFROST_MAX_RENDER_TARGET_COUNT];
+        nir_alu_type blend_types[8];
 
         /* Prepended before uniforms, mapping to SYSVAL_ names for the
          * sysval */