Minor adjustments to conversion inputs

DCNick3 · DCNick3 · commit 2da4890c4e6e · 2023-03-04T04:40:12.000+03:00
- Mark all previous stage results as stored (otherwise no vertex attributes are generated)
- use GLSL 450
- set viewportTransformEnabled to true to avoid generating weird viewport transform code
diff --git a/bridge/src/bridge.cc b/bridge/src/bridge.cc
@@ -41,7 +41,7 @@ namespace Bridge {
         )
                 : binary{std::move(pBinary)}, baseOffset{baseOffset},
                 textureBufferIndex{0},
-                viewportTransformEnabled{false}
+                viewportTransformEnabled{true}
 //                constantBufferRead{std::move(constantBufferRead)}, getTextureType{std::move(getTextureType)}
         {
             stage = pStage;
@@ -226,7 +226,12 @@ namespace Bridge {
             .gl_max_compute_smem_size = 0,
         };
 
-        auto spirv = Shader::Backend::SPIRV::EmitSPIRV(profile, program);
+        Shader::Backend::Bindings binding;
+        Shader::RuntimeInfo runtime_info;
+
+        runtime_info.previous_stage_stores.mask.set();
+
+        auto spirv = Shader::Backend::SPIRV::EmitSPIRV(profile, runtime_info, program, binding);
 
         rust::Vec<u32> result;
         result.reserve(spirv.size());
diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -56,16 +56,16 @@ fn main() {
     let shader = &shader[0x30..];
 
     let spirv = shader_compiler_bridge::translate_shader(shader.to_vec());
-    let spirv_bytes = spirv.as_byte_slice();
 
+    // let spirv_bytes = spirv.as_byte_slice();
     // std::fs::write("shader.spv", spirv_bytes).unwrap();
 
     let module = spirv_cross::spirv::Module::from_words(&spirv);
     let mut ast = spirv_cross::spirv::Ast::<spirv_cross::glsl::Target>::parse(&module)
         .expect("Failed to parse SPIR-V");
 
     let mut options = spirv_cross::glsl::CompilerOptions::default();
-    options.version = spirv_cross::glsl::Version::V3_30;
+    options.version = spirv_cross::glsl::Version::V4_50;
     options.vulkan_semantics = true;
 
     ast.set_compiler_options(&options)
