From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Thu, 31 Dec 2015 01:32:03 +0000 (-0800)
Subject: nir/spirv: Handle OpLine
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5afac62b28ad3061928d623727a802f975eaae46;p=mesa.git

nir/spirv: Handle OpLine
---

diff --git a/src/glsl/nir/spirv/spirv_to_nir.c b/src/glsl/nir/spirv/spirv_to_nir.c
index e5c99cd7bf4..1118d75351d 100644
--- a/src/glsl/nir/spirv/spirv_to_nir.c
+++ b/src/glsl/nir/spirv/spirv_to_nir.c
@@ -3248,9 +3248,6 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
       /* TODO */
       break;
 
-   case SpvOpLine:
-      break; /* Ignored for now */
-
    case SpvOpExecutionMode:
    case SpvOpDecorationGroup:
    case SpvOpDecorate:
@@ -3380,7 +3377,6 @@ vtn_handle_variable_or_type_instruction(struct vtn_builder *b, SpvOp opcode,
    case SpvOpString:
    case SpvOpName:
    case SpvOpMemberName:
-   case SpvOpLine:
    case SpvOpDecorationGroup:
    case SpvOpDecorate:
    case SpvOpMemberDecorate:
@@ -3389,6 +3385,9 @@ vtn_handle_variable_or_type_instruction(struct vtn_builder *b, SpvOp opcode,
       assert(!"Invalid opcode types and variables section");
       break;
 
+   case SpvOpLine:
+      break; /* Ignored for now */
+
    case SpvOpTypeVoid:
    case SpvOpTypeBool:
    case SpvOpTypeInt:
@@ -3440,6 +3439,9 @@ vtn_handle_body_instruction(struct vtn_builder *b, SpvOp opcode,
                             const uint32_t *w, unsigned count)
 {
    switch (opcode) {
+   case SpvOpLine:
+      break; /* Ignored for now */
+
    case SpvOpLabel: {
       struct vtn_block *block = vtn_value(b, w[1], vtn_value_type_block)->block;
       assert(block->block == nir_cursor_current_block(b->nb.cursor));