From cff74d6fb876c0ca4a6c5c5041c02770241beeb2 Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Fri, 20 Nov 2015 15:02:45 -0800
Subject: [PATCH] nir/spirv: Handle OpNop

---
 src/glsl/nir/spirv_to_nir.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/glsl/nir/spirv_to_nir.c b/src/glsl/nir/spirv_to_nir.c
index db023f614a8..ba49b04a54e 100644
--- a/src/glsl/nir/spirv_to_nir.c
+++ b/src/glsl/nir/spirv_to_nir.c
@@ -141,6 +141,11 @@ vtn_foreach_instruction(struct vtn_builder *b, const uint32_t *start,
       unsigned count = w[0] >> SpvWordCountShift;
       assert(count >= 1 && w + count <= end);
 
+      if (opcode == SpvOpNop) {
+         w++;
+         continue;
+      }
+
       if (!handler(b, opcode, w, count))
          return w;
 
-- 
2.30.2