nir: lower int16 and uint16 in nir_lower_mediump_outputs

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5002>

diff --git a/src/compiler/nir/nir_lower_mediump_outputs.c b/src/compiler/nir/nir_lower_mediump_outputs.c
index 1b3b9ebc7ae02ca3ccb2026c9ad3a516003e39a8..13c03f9b6245f2f01f13671776f2bbc45c2fcc1d 100644 (file)
--- a/src/compiler/nir/nir_lower_mediump_outputs.c
+++ b/src/compiler/nir/nir_lower_mediump_outputs.c
@@ -24,24 +24,7 @@
 #include "nir.h"
 #include "nir_builder.h"
 
-/* Lower mediump FS outputs to fp16 */
-
-static bool
-lower_output_var(nir_shader *nir, int location)
-{
-   nir_foreach_variable (var, &nir->outputs) {
-      if (var->data.driver_location == location &&
-            ((var->data.precision == GLSL_PRECISION_MEDIUM) ||
-             (var->data.precision == GLSL_PRECISION_LOW))) {
-         if (glsl_get_base_type(var->type) == GLSL_TYPE_FLOAT)
-            var->type = glsl_float16_type(var->type);
-         
-         return glsl_get_base_type(var->type) == GLSL_TYPE_FLOAT16;
-      }
-   }
-
-   return false;
-}
+/* Lower mediump outputs to float16, int16, or uint16. */
 
 void
 nir_lower_mediump_outputs(nir_shader *nir)
@@ -64,14 +47,43 @@ nir_lower_mediump_outputs(nir_shader *nir)
          if (intr->intrinsic != nir_intrinsic_store_output)
             continue;
 
-         if (!lower_output_var(nir, nir_intrinsic_base(intr)))
-            continue;
+         nir_foreach_variable (var, &nir->outputs) {
+            if (var->data.driver_location != nir_intrinsic_base(intr))
+               continue; /* not found yet */
+
+            if (var->data.precision != GLSL_PRECISION_MEDIUM &&
+                var->data.precision != GLSL_PRECISION_LOW)
+               break; /* can't lower */
+
+            switch (glsl_get_base_type(var->type)) {
+            case GLSL_TYPE_FLOAT:
+               var->type = glsl_float16_type(var->type);
+               b.cursor = nir_before_instr(&intr->instr);
+               nir_instr_rewrite_src(&intr->instr, &intr->src[0],
+                     nir_src_for_ssa(nir_f2f16(&b, intr->src[0].ssa)));
+               nir_intrinsic_set_type(intr, nir_type_float16);
+               break;
+
+            case GLSL_TYPE_INT:
+               var->type = glsl_int16_type(var->type);
+               b.cursor = nir_before_instr(&intr->instr);
+               nir_instr_rewrite_src(&intr->instr, &intr->src[0],
+                     nir_src_for_ssa(nir_i2i16(&b, intr->src[0].ssa)));
+               nir_intrinsic_set_type(intr, nir_type_int16);
+               break;
 
-         b.cursor = nir_before_instr(&intr->instr);
-         nir_instr_rewrite_src(&intr->instr, &intr->src[0],
-         nir_src_for_ssa(nir_f2f16(&b, intr->src[0].ssa)));
+            case GLSL_TYPE_UINT:
+               var->type = glsl_uint16_type(var->type);
+               b.cursor = nir_before_instr(&intr->instr);
+               nir_instr_rewrite_src(&intr->instr, &intr->src[0],
+                     nir_src_for_ssa(nir_u2u16(&b, intr->src[0].ssa)));
+               nir_intrinsic_set_type(intr, nir_type_uint16);
+               break;
 
-         nir_intrinsic_set_type(intr, nir_type_float16);
+            default:;
+            }
+            break;
+         }
       }
    }
 }