Roll back changes to SPIRV optimizer so there's no merge conflicts later

Author: Fletterio

include/nbl/asset/utils/ISPIRVOptimizer.h

@@ -24,6 +24,7 @@ class ISPIRVOptimizer final : public core::IReferenceCounted
             EOP_SIMPLIFICATION,
             EOP_VECTOR_DCE,
             EOP_DEAD_INSERT_ELIM,
+            EOP_AGGRESSIVE_DCE,
             EOP_DEAD_BRANCH_ELIM,
             EOP_BLOCK_MERGE,
             EOP_LOCAL_MULTI_STORE_ELIM,
@@ -33,8 +34,6 @@ class ISPIRVOptimizer final : public core::IReferenceCounted
             EOP_REDUCE_LOAD_SIZE,
             EOP_STRENGTH_REDUCTION,
             EOP_IF_CONVERSION,
-            EOP_STRIP_DEBUG,
-            EOP_AGGRESSIVE_DCE,
 
             EOP_COUNT
         };

src/nbl/asset/utils/ISPIRVOptimizer.cpp

@@ -32,6 +32,7 @@ nbl::core::smart_refctd_ptr<ICPUBuffer> ISPIRVOptimizer::optimize(const uint32_t
         &spvtools::CreateSimplificationPass,
         &spvtools::CreateVectorDCEPass,
         &spvtools::CreateDeadInsertElimPass,
+        //&spvtools::CreateAggressiveDCEPass
         &spvtools::CreateDeadBranchElimPass,
         &spvtools::CreateBlockMergePass,
         &spvtools::CreateLocalMultiStoreElimPass,
@@ -41,8 +42,6 @@ nbl::core::smart_refctd_ptr<ICPUBuffer> ISPIRVOptimizer::optimize(const uint32_t
         CreateReduceLoadSizePass,
         &spvtools::CreateStrengthReductionPass,
         &spvtools::CreateIfConversionPass,
-        &spvtools::CreateStripDebugInfoPass,
-        //&spvtools::CreateAggressiveDCEPass
     };
 
     auto msgConsumer = [&logger](spv_message_level_t level, const char* src, const spv_position_t& pos, const char* msg)