Rollback optimizations and validate inputs and outputs

supernovaengine · Jan 19, 2024 · 9ae953c · 9ae953c
1 parent 2231124
commit 9ae953c
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 4 deletions.
diff --git a/src/glslang.cc b/src/glslang.cc
@@ -205,24 +205,24 @@ void spirv_optimize(const glslang::TIntermediate& intermediate, std::vector<unsi
     optimizer.RegisterPass(spvtools::CreateLocalSingleBlockLoadStoreElimPass());
     optimizer.RegisterPass(spvtools::CreateLocalSingleStoreElimPass());
     optimizer.RegisterPass(spvtools::CreateSimplificationPass());
-    //optimizer.RegisterPass(spvtools::CreateAggressiveDCEPass());
+    optimizer.RegisterPass(spvtools::CreateAggressiveDCEPass());
     optimizer.RegisterPass(spvtools::CreateVectorDCEPass());
     optimizer.RegisterPass(spvtools::CreateDeadInsertElimPass());
-    //optimizer.RegisterPass(spvtools::CreateAggressiveDCEPass());
+    optimizer.RegisterPass(spvtools::CreateAggressiveDCEPass());
     optimizer.RegisterPass(spvtools::CreateDeadBranchElimPass());
     //optimizer.RegisterPass(spvtools::CreateBlockMergePass());
     //optimizer.RegisterPass(spvtools::CreateLocalMultiStoreElimPass());
     optimizer.RegisterPass(spvtools::CreateIfConversionPass());
     optimizer.RegisterPass(spvtools::CreateSimplificationPass());
-    //optimizer.RegisterPass(spvtools::CreateAggressiveDCEPass());
+    optimizer.RegisterPass(spvtools::CreateAggressiveDCEPass());
     optimizer.RegisterPass(spvtools::CreateVectorDCEPass());
     optimizer.RegisterPass(spvtools::CreateDeadInsertElimPass());
     optimizer.RegisterPass(spvtools::CreateInterpolateFixupPass());
     if (options->optimizeSize) {
         optimizer.RegisterPass(spvtools::CreateRedundancyEliminationPass());
         optimizer.RegisterPass(spvtools::CreateEliminateDeadInputComponentsSafePass());
     }
-    //optimizer.RegisterPass(spvtools::CreateAggressiveDCEPass());
+    optimizer.RegisterPass(spvtools::CreateAggressiveDCEPass());
     optimizer.RegisterPass(spvtools::CreateCFGCleanupPass());
 
     spvtools::OptimizerOptions spvOptOptions;

diff --git a/src/spirvcross.cc b/src/spirvcross.cc
@@ -425,6 +425,35 @@ static bool parse_reflection_glsl(const std::vector<uint32_t>& bytecode, spirvcr
     return parse_reflection(spirvcross, &compiler);
 }
 
+bool validate_inputs_and_outputs(std::vector<spirvcross_t>& spirvcrossvec, const std::vector<input_t>& inputs){
+    int vsIndex = -1;
+    int fsIndex = -1;
+    for (int s = 0; s < inputs.size(); s++){
+        if (inputs[s].stage_type == stage_type_t::STAGE_VERTEX)
+            vsIndex = s;
+        if (inputs[s].stage_type == stage_type_t::STAGE_FRAGMENT)
+            fsIndex = s;
+    }
+
+    for (int o = 0; o < spirvcrossvec[vsIndex].outputs.size(); o++){
+        bool found = false;
+        supershader::s_attr_t output = spirvcrossvec[vsIndex].outputs[o];
+        for (int i = 0; i < spirvcrossvec[fsIndex].inputs.size(); i++){
+            supershader::s_attr_t input = spirvcrossvec[fsIndex].inputs[i];
+            if (output.name == input.name && output.type == input.type){
+                found = true;
+            }
+        }
+
+        if (!found){
+            fprintf(stderr, "%s, %s: vertex shader output '%s' does not exist in fragment shader inputs\n", inputs[vsIndex].filename.c_str(), inputs[fsIndex].filename.c_str(), output.name.c_str());
+            return false;
+        }
+    }
+
+    return true;
+}
+
 bool supershader::compile_to_lang(std::vector<spirvcross_t>& spirvcrossvec, const std::vector<spirv_t>& spirvvec, const std::vector<input_t>& inputs, const args_t& args){
     for (int i = 0; i < inputs.size(); i++){
         spirv_cross::Parser spirv_parser(std::move(spirvvec[i].bytecode));
@@ -521,5 +550,9 @@ bool supershader::compile_to_lang(std::vector<spirvcross_t>& spirvcrossvec, cons
         if (!parse_reflection_glsl(spirvvec[i].bytecode, spirvcrossvec[i]))
             return false;
     }
+
+    if (!validate_inputs_and_outputs(spirvcrossvec, inputs))
+        return false;
+
     return true;
 }