nir/spirv: Move CF emit code into vtn_cfg.c

[mesa.git] / src / glsl / opt_tree_grafting.cpp

diff --git a/src/glsl/opt_tree_grafting.cpp b/src/glsl/opt_tree_grafting.cpp
index 7f2ee6cee341ddaaa6ddf1eacd2639cfaa8de36b..cd58213c019348de02439c2dcd2188d722201713 100644 (file)
--- a/src/glsl/opt_tree_grafting.cpp
+++ b/src/glsl/opt_tree_grafting.cpp
@@ -274,6 +274,8 @@ ir_tree_grafting_visitor::visit_enter(ir_texture *ir)
    case ir_tex:
    case ir_lod:
    case ir_query_levels:
+   case ir_texture_samples:
+   case ir_samples_identical:
       break;
    case ir_txb:
       if (do_graft(&ir->lod_info.bias))
@@ -372,8 +374,6 @@ tree_grafting_basic_block(ir_instruction *bb_first,
          entry->referenced_count != 2)
         continue;
 
-      assert(assign == entry->assign);
-
       /* Found a possibly graftable assignment.  Now, walk through the
        * rest of the BB seeing if the deref is here, and if nothing interfered with
        * pasting its expression's values in between.