pan/bi: Force BI_SELECT arguments scalar
authorAlyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Sat, 25 Apr 2020 00:52:28 +0000 (20:52 -0400)
committerMarge Bot <eric+marge@anholt.net>
Mon, 27 Apr 2020 14:52:26 +0000 (14:52 +0000)
Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4766>

src/panfrost/bifrost/bir.c

index 3c5ad9bf71b90af751ff3ed07e13ace758caa792..a40b33800f80c8e3dbd9fc3991d25697ea067768 100644 (file)
@@ -100,6 +100,10 @@ bi_get_component_count(bi_instruction *ins, signed src)
                 return (src <= 0) ? ins->vector_channels : 1;
         } else {
                 unsigned bytes = nir_alu_type_get_type_size(src < 0 ? ins->dest_type : ins->src_types[src]);
+                
+                if (ins->type == BI_ATEST || ins->type == BI_SELECT)
+                        return 1;
+
                 return MAX2(32 / bytes, 1);
         }
 }