Mesa (master): pan/mdg: Handle 16-bit ld_vary

[GitLab Mirror]

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

Author: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Date:   Fri May 22 16:22:48 2020 -0400

pan/mdg: Handle 16-bit ld_vary

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

---

 src/panfrost/midgard/midgard_compile.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c
index e1d6cac7672..bc0c7b6cd44 100644
--- a/src/panfrost/midgard/midgard_compile.c
+++ b/src/panfrost/midgard/midgard_compile.c
@@ -1271,16 +1271,19 @@ emit_varying_read(
 
         /* Use the type appropriate load */
         switch (type) {
-        case nir_type_uint:
-        case nir_type_bool:
+        case nir_type_uint32:
+        case nir_type_bool32:
                 ins.load_store.op = midgard_op_ld_vary_32u;
                 break;
-        case nir_type_int:
+        case nir_type_int32:
                 ins.load_store.op = midgard_op_ld_vary_32i;
                 break;
-        case nir_type_float:
+        case nir_type_float32:
                 ins.load_store.op = midgard_op_ld_vary_32;
                 break;
+        case nir_type_float16:
+                ins.load_store.op = midgard_op_ld_vary_16;
+                break;
         default:
                 unreachable("Attempted to load unknown type");
                 break;
@@ -1540,7 +1543,7 @@ emit_intrinsic(compiler_context *ctx, nir_intrinsic_instr *instr)
                 } else if (is_global || is_shared) {
                         emit_global(ctx, &instr->instr, true, reg, src_offset, is_shared);
                 } else if (ctx->stage == MESA_SHADER_FRAGMENT && !ctx->is_blend) {
-                        emit_varying_read(ctx, reg, offset, nr_comp, component, indirect_offset, t, is_flat);
+                        emit_varying_read(ctx, reg, offset, nr_comp, component, indirect_offset, t | nir_dest_bit_size(instr->dest), is_flat);
                 } else if (ctx->is_blend) {
                         /* For blend shaders, load the input color, which is
                          * preloaded to r0 */