From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Wed, 13 May 2020 20:01:08 +0000 (-0400)
Subject: panfrost: Conditionally allow fp16 blending
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0c9fe82ee92c1a6ba9a3f8230ed94bac8bbca0be;p=mesa.git

panfrost: Conditionally allow fp16 blending

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

diff --git a/src/gallium/drivers/panfrost/nir/nir_lower_blend.c b/src/gallium/drivers/panfrost/nir/nir_lower_blend.c
index 99e34e48724..f46f635da48 100644
--- a/src/gallium/drivers/panfrost/nir/nir_lower_blend.c
+++ b/src/gallium/drivers/panfrost/nir/nir_lower_blend.c
@@ -79,11 +79,12 @@ static nir_ssa_def *
 nir_alpha_saturate(
    nir_builder *b,
    nir_ssa_def *src, nir_ssa_def *dst,
-   unsigned chan)
+   unsigned chan,
+   bool half)
 {
    nir_ssa_def *Asrc = nir_channel(b, src, 3);
    nir_ssa_def *Adst = nir_channel(b, dst, 3);
-   nir_ssa_def *one = nir_imm_float(b, 1.0);
+   nir_ssa_def *one = half ? nir_imm_float16(b, 1.0) : nir_imm_float(b, 1.0);
    nir_ssa_def *Adsti = nir_fsub(b, one, Adst);
 
    return (chan < 3) ? nir_fmin(b, Asrc, Adsti) : one;
@@ -96,11 +97,12 @@ nir_blend_factor_value(
    nir_builder *b,
    nir_ssa_def *src, nir_ssa_def *dst, nir_ssa_def *bconst,
    unsigned chan,
-   enum blend_factor factor)
+   enum blend_factor factor,
+   bool half)
 {
    switch (factor) {
    case BLEND_FACTOR_ZERO:
-      return nir_imm_float(b, 0.0);
+      return half ? nir_imm_float16(b, 0.0) : nir_imm_float(b, 0.0);
    case BLEND_FACTOR_SRC_COLOR:
       return nir_channel(b, src, chan);
    case BLEND_FACTOR_DST_COLOR:
@@ -114,7 +116,7 @@ nir_blend_factor_value(
    case BLEND_FACTOR_CONSTANT_ALPHA:
       return nir_channel(b, bconst, 3);
    case BLEND_FACTOR_SRC_ALPHA_SATURATE:
-      return nir_alpha_saturate(b, src, dst, chan);
+      return nir_alpha_saturate(b, src, dst, chan, half);
    }
 
    unreachable("Invalid blend factor");
@@ -127,13 +129,16 @@ nir_blend_factor(
    nir_ssa_def *src, nir_ssa_def *dst, nir_ssa_def *bconst,
    unsigned chan,
    enum blend_factor factor,
-   bool inverted)
+   bool inverted,
+   bool half)
 {
    nir_ssa_def *f =
-      nir_blend_factor_value(b, src, dst, bconst, chan, factor);
+      nir_blend_factor_value(b, src, dst, bconst, chan, factor, half);
+
+   nir_ssa_def *unity = half ? nir_imm_float16(b, 1.0) : nir_imm_float(b, 1.0);
 
    if (inverted)
-      f = nir_fsub(b, nir_imm_float(b, 1.0), f);
+      f = nir_fsub(b, unity, f);
 
    return nir_fmul(b, raw_scalar, f);
 }
@@ -249,6 +254,9 @@ nir_blend(
    /* Grab the blend constant ahead of time */
    nir_ssa_def *bconst = nir_load_blend_const_color_rgba(b);
 
+   if (options.half)
+      bconst = nir_f2f16(b, bconst);
+
    /* We blend per channel and recombine later */
    nir_ssa_def *channels[4];
 
@@ -264,12 +272,12 @@ nir_blend(
          psrc = nir_blend_factor(
                    b, psrc,
                    src, dst, bconst, c,
-                   chan.src_factor, chan.invert_src_factor);
+                   chan.src_factor, chan.invert_src_factor, options.half);
 
          pdst = nir_blend_factor(
                    b, pdst,
                    src, dst, bconst, c,
-                   chan.dst_factor, chan.invert_dst_factor);
+                   chan.dst_factor, chan.invert_dst_factor, options.half);
       }
 
       channels[c] = nir_blend_func(b, chan.func, psrc, pdst);
diff --git a/src/gallium/drivers/panfrost/nir/nir_lower_blend.h b/src/gallium/drivers/panfrost/nir/nir_lower_blend.h
index b2885d5b5c2..f846ba10827 100644
--- a/src/gallium/drivers/panfrost/nir/nir_lower_blend.h
+++ b/src/gallium/drivers/panfrost/nir/nir_lower_blend.h
@@ -52,6 +52,9 @@ typedef struct {
    bool logicop_enable;
    unsigned logicop_func;
    enum pipe_format format;
+
+   /* Use fp16 instead of fp32 */
+   bool half;
 } nir_lower_blend_options;
 
 void nir_lower_blend(nir_shader *shader, nir_lower_blend_options options);