panfrost: Inline max rt into compilers
authorAlyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Wed, 5 Aug 2020 22:10:41 +0000 (18:10 -0400)
committerMarge Bot <eric+marge@anholt.net>
Thu, 6 Aug 2020 23:54:24 +0000 (23:54 +0000)
Another dep.

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

src/panfrost/bifrost/bifrost_compile.c
src/panfrost/util/pan_ir.h

index ed8741ddb5a5eb07d4098942eb5a0f6275229b05..0c7942f7e9548e39bd5d3ec03e99be2e8a58f425 100644 (file)
@@ -169,7 +169,7 @@ bi_emit_frag_out(bi_context *ctx, nir_intrinsic_instr *instr)
                 .vector_channels = 4
         };
 
                 .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];
         assert(ctx->blend_types);
         assert(blend.src_types[0]);
         ctx->blend_types[blend.blend_location] = blend.src_types[0];
index 99a8e5ba70f5371f17e0bd4a3a06843b0e40c1eb..bf9c7b00cf8b3f85426e536e1ca3c7c6ff214254 100644 (file)
@@ -87,7 +87,7 @@ typedef struct {
         int uniform_cutoff;
 
         /* For Bifrost - output type for each RT */
         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 */
 
         /* Prepended before uniforms, mapping to SYSVAL_ names for the
          * sysval */