1 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index de78c2b8c7..5da98550dc 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -2260,7 +2260,10 @@ _slang_gen_operation(slang_assemble_ctx * A, slang_operation *oper)
 #endif
          return tree;
       }
-      break;
+      else {
+         return new_node0(IR_NOP);
+      }
+
    case SLANG_OPER_EXPRESSION:
       return _slang_gen_operation(A, &oper->children[0]);
 
@@ -2485,9 +2488,9 @@ _slang_gen_operation(slang_assemble_ctx * A, slang_operation *oper)
       }
 
    case SLANG_OPER_NONE:
-      return NULL;
    case SLANG_OPER_VOID:
-      return NULL;
+      /* returning NULL here would generate an error */
+      return new_node0(IR_NOP);
 
    default:
       printf("Unhandled node type %d\n", oper->type);