From: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Date: Thu, 4 Apr 2019 20:42:26 +0000 (-0700)
Subject: spirv: Trivially handle new 1.4 loop controls
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fd94a458234d21f5f43b88ae8edb095b4c01e626;p=mesa.git

spirv: Trivially handle new 1.4 loop controls

Reviewed-by: Karol Herbst <kherbst@redhat.com>
---

diff --git a/src/compiler/spirv/vtn_cfg.c b/src/compiler/spirv/vtn_cfg.c
index 323e3da52c4..87c3fde3f31 100644
--- a/src/compiler/spirv/vtn_cfg.c
+++ b/src/compiler/spirv/vtn_cfg.c
@@ -889,7 +889,12 @@ vtn_loop_control(struct vtn_builder *b, struct vtn_loop *vtn_loop)
    else if (vtn_loop->control & SpvLoopControlUnrollMask)
       return nir_loop_control_unroll;
    else if (vtn_loop->control & SpvLoopControlDependencyInfiniteMask ||
-            vtn_loop->control & SpvLoopControlDependencyLengthMask) {
+            vtn_loop->control & SpvLoopControlDependencyLengthMask ||
+            vtn_loop->control & SpvLoopControlMinIterationsMask ||
+            vtn_loop->control & SpvLoopControlMaxIterationsMask ||
+            vtn_loop->control & SpvLoopControlIterationMultipleMask ||
+            vtn_loop->control & SpvLoopControlPeelCountMask ||
+            vtn_loop->control & SpvLoopControlPartialCountMask) {
       /* We do not do anything special with these yet. */
       return nir_loop_control_none;
    } else {